tianzeOrg
/
tianze-pro
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

院校只能查询当前院校的信息

Browse Source
beetlsql3-dev
Mlxa0324 2 years ago
parent 06c5b4f151
commit 975c719254
18 changed files with 135 additions and 87 deletions
Show Stats Download Patch File Download Diff File

4
admin-console/src/main/java/com/ibeetl/admin/console/service/UserConsoleService.java
Unescape Escape View File

@ -198,7 +198,9 @@ public class UserConsoleService extends CoreBaseService<CoreUser> {
CoreUserRole userRole = new CoreUserRole();
userRole.setUserId(userId);
userRole.setRoleId(Long.parseLong(roleIds.split(",")[i]));
userRole.setOrgId(1L); // TODO 暂时写1
CoreUser coreUser = userDao.createLambdaQuery().andEq(CoreUser::getId, userId)
.single("org_id");
userRole.setOrgId(coreUser.getOrgId());
userRole.setCreateTime(new Date());
coreUserRoleDao.insert(userRole);
}

1
admin-console/src/main/java/com/ibeetl/admin/console/web/UserConsoleController.java
Unescape Escape View File

@ -136,7 +136,6 @@ public class UserConsoleController {
@Function("user.edit")
@ResponseBody
public JsonResult update(@Validated(ValidateConfig.UPDATE.class) CoreUser user, @SCoreUser CoreUser coreUser) {
user.setId(coreUser.getId());
boolean success = userConsoleService.updateTemplate(user);
if (success) {
this.platformService.clearFunctionCache();

14
admin-console/src/main/resources/sql/console/org.md
Unescape Escape View File

@ -6,26 +6,26 @@ queryByCondition
===
select
@pageTag(){
o.*
t.*
@}
from core_org o where 1=1 and del_flag = 0
from core_org t where 1=1 and del_flag = 0
@ //数据权限，组织机构对应的对应的字段
and #function("org.query",{org:"id"})#
@if(!isEmpty(code)){
and o.code like #"%"+code+"%"#
and t.code like #"%"+code+"%"#
@}
@if(!isEmpty(name)){
and o.name like #"%"+name+"%"#
and t.name like #"%"+name+"%"#
@}
@if(!isEmpty(type)){
and o.type = #type#
and t.type = #type#
@}
@if(!isEmpty(parentOrgId)){
and o.parent_org_id = #parentOrgId#
and t.parent_org_id = #parentOrgId#
@}
@pageIgnoreTag(){
order by o.id
order by t.id
@}

22
admin-console/src/main/resources/sql/console/user.md
Unescape Escape View File

@ -4,37 +4,37 @@ queryByCondition
select
@pageTag(){
u.*,o.name org_name,(SELECT GROUP_CONCAT(ROLE_ID) FROM core_user_role WHERE user_id = u.id) ROLE_IDS
t.*,o.name org_name,(SELECT GROUP_CONCAT(ROLE_ID) FROM core_user_role WHERE user_id = t.id) ROLE_IDS
@}
from core_user u left join core_org o on u.org_id=o.id where u.ID != 1 and u.del_flag = 0
from core_user t left join core_org o on t.org_id=o.id where t.ID != 1 and t.del_flag = 0
@//数据权限，该sql语句功能点
and #function("user.query")#
@if(!isEmpty(orgId)){
and u.org_id =#orgId#
and t.org_id =#orgId#
@}
@if(!isEmpty(orgId)){
and u.org_id =#orgId#
and t.org_id =#orgId#
@}
@if(!isEmpty(code)){
and u.code like #"%"+code+"%"#
and t.code like #"%"+code+"%"#
@}
@if(!isEmpty(name)){
and u.name like #"%"+name+"%"#
and t.name like #"%"+name+"%"#
@}
@if(!isEmpty(state)){
and u.state = #state#
and t.state = #state#
@}
@if(!isEmpty(jobType0)){
and u.job_type0= #jobType0#
and t.job_type0= #jobType0#
@}
@if(!isEmpty(jobType1)){
and u.job_type1= #jobType1#
and t.job_type1= #jobType1#
@}
@if(!isEmpty(createDateMin)){
and u.create_time>= #createDateMin#
and t.create_time>= #createDateMin#
@}
@if(!isEmpty(createDateMax)){
and u.create_time< #nextDay(createDateMax)#
and t.create_time< #nextDay(createDateMax)#
@}

33
admin-core/src/main/java/com/ibeetl/admin/core/rbac/da/DefaultDataAccessFactory.java
Unescape Escape View File

@ -1,15 +1,14 @@
package com.ibeetl.admin.core.rbac.da;
import com.ibeetl.admin.core.rbac.DataAccess;
import com.ibeetl.admin.core.rbac.DataAccessFactory;
import com.ibeetl.admin.core.rbac.tree.OrgItem;
import org.springframework.context.ApplicationContext;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.springframework.context.ApplicationContext;
import com.ibeetl.admin.core.rbac.DataAccess;
import com.ibeetl.admin.core.rbac.DataAccessFactory;
import com.ibeetl.admin.core.rbac.tree.OrgItem;
/**
* 系统提供的数据访问权限设置，适合大多数情况。如果只是小型公司，只需要配置数据字典组织机构类型和数据访问类型为系统默认的子集即可
*
@ -39,16 +38,22 @@ public class DefaultDataAccessFactory implements DataAccessFactory {
DataAccess da7 = applicationContext.getBean(ParentCorpDataAccess.class);
DataAccess da8 = applicationContext.getBean(GroupOnlyDataAccess.class);
this.addDataAccessType(da1);
this.addDataAccessType(da2);
this.addDataAccessType(da3);
this.addDataAccessType(da4);
// this.addDataAccessType(da1);
// this.addDataAccessType(da2);
// this.addDataAccessType(da3);
// this.addDataAccessType(da4);
// this.addDataAccessType(da5);
// this.addDataAccessType(da6);
// this.addDataAccessType(da6);
// this.addDataAccessType(da7);
// this.addDataAccessType(da8);
this.addDataAccessType(da5);
this.addDataAccessType(da6);
this.addDataAccessType(da6);
this.addDataAccessType(da7);
this.addDataAccessType(da8);
this.addDataAccessType(da2);
this.addDataAccessType(da4);
this.addDataAccessType(da3);
this.addDataAccessType(da1);
}
public DataAccess getDataAccess(Integer type){

14
admin-core/src/main/java/com/ibeetl/admin/core/rbac/tree/OrgItem.java
Unescape Escape View File

@ -162,5 +162,17 @@ public class OrgItem implements TreeItem {
}
//找到相应类型的父级
public OrgItem findParent(OrgItem orgItem,String type){
if(orgItem.org.getType().equals(type)){
return orgItem;
}
OrgItem find = orgItem.parent.findParent(orgItem.parent,type);
if(find!=null){
return find;
}
return null;
}
}

32
admin-core/src/main/java/com/ibeetl/admin/core/util/beetl/DataAccessFunction.java
Unescape Escape View File

@ -35,12 +35,8 @@ public class DataAccessFunction implements Function {
private static final Map defaultTargets = new HashMap();
static{
//数据库默认的跟组织和用户相关字段
defaultTargets.put("org", "SELECT count(0)>0 FROM core_org WHERE id");
defaultTargets.put("user", "SELECT count(0)>0 FROM core_user WHERE id");
defaultTargets.put("g_org", "t.online_shop_id");
defaultTargets.put("g_user", "t.user_id");
defaultTargets.put("u_org", "o.id");
defaultTargets.put("u_user", "u.id");
defaultTargets.put("org", "t.org_id");
defaultTargets.put("user", "t.user_id");
}
private static final String SQL_MY_DATA = "user_id=? ";
private static final String SQL_MY_ORG_DATA = "org_id=? ";
@ -97,13 +93,7 @@ public class DataAccessFunction implements Function {
switch(ret.getStatus()){
case NoneOrg:{
if( functionCode.contains("user.") ){
sb.append(targets.get("u_org")+" in (-1) ");
}else if( functionCode.contains("goods.") ){
sb.append(targets.get("g_org")+" in (-1) ");
}else {
sb.append(targets.get("org")+" in (-1) ");
}
sb.append(targets.get("org")+" in (-1) ");
break;
}
case AllOrg:{
@ -113,13 +103,7 @@ public class DataAccessFunction implements Function {
}
case OnlyUser:{
List<Long> ids = ret.getUserIds();
if( functionCode.contains("user.") ){
sb.append(targets.get("u_user"));
}else if( functionCode.contains("goods.") ){
sb.append(targets.get("g_user"));
}else {
sb.append(targets.get("user"));
}
sb.append(targets.get("user"));
if(ids.size()==0){
sb.append("=-1/*指定用户，但没有候选用户*/");
continue;
@ -144,13 +128,7 @@ public class DataAccessFunction implements Function {
}
case OnlyOrg:{
List<Long> ids = ret.getOrgIds();
if( functionCode.contains("user.") ){
sb.append(targets.get("u_org"));
}else if( functionCode.contains("goods.") ){
sb.append(targets.get("g_org"));
}else {
sb.append(targets.get("org"));
}
sb.append(targets.get("org"));
if(ids.size()==0){
sb.append("=-1/*指定机构，但没有候选机构*/");
continue;

16
web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseStudentSigninLog.java
Unescape Escape View File

@ -40,12 +40,12 @@ public class TeacherOpenCourseStudentSigninLog extends BaseEntity{
private DateTime teacherOpenCourseStudentSigninSettingSessionTime;
//学生ID
// @Dict(type="student.student_name.student_status=1")
@Dict(type="student.student_name.student_status=1")
private Long studentId ;
@FetchSql("select t.student_name from student t where t.student_id = #studentId# ")
// @FetchSql("select t.student_name from student t where t.student_id = #studentId# ")
@UpdateIgnore
@InsertIgnore
private String studentIdText;
@ -56,23 +56,23 @@ public class TeacherOpenCourseStudentSigninLog extends BaseEntity{
private String studentSn;
//开课ID
// @Dict(type="teacher_open_course.teacher_open_course_title.teacher_open_course_status=1")
@Dict(type="teacher_open_course.teacher_open_course_title.teacher_open_course_status=1")
private Long teacherOpenCourseId ;
@FetchSql("select t.teacher_open_course_title from teacher_open_course t " +
"where t.teacher_open_course_id = #teacherOpenCourseId# and t.teacher_open_course_status=1 ")
// @FetchSql("select t.teacher_open_course_title from teacher_open_course t " +
// "where t.teacher_open_course_id = #teacherOpenCourseId# and t.teacher_open_course_status=1 ")
@UpdateIgnore
@InsertIgnore
private String teacherOpenCourseIdText;
//班级ID
// @Dict(type="school_class.class_name.class_status=1")
@Dict(type="school_class.class_name.class_status=1")
private Long schoolClassId ;
@FetchSql("select t.class_name from school_class t " +
"where t.class_id = #schoolClassId# and t.class_status=1 ")
// @FetchSql("select t.class_name from school_class t " +
// "where t.class_id = #schoolClassId# and t.class_status=1 ")
@UpdateIgnore
@InsertIgnore
private String schoolClassIdText;

11
web/src/main/java/com/ibeetl/jlw/web/ResourcesInfoController.java
Unescape Escape View File

@ -1,10 +1,12 @@
package com.ibeetl.jlw.web;
import cn.jlw.Interceptor.SCoreUser;
import cn.jlw.util.ToolUtils;
import cn.jlw.validate.ValidateConfig;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.ibeetl.admin.core.annotation.Function;
import com.ibeetl.admin.core.entity.CoreUser;
import com.ibeetl.admin.core.file.FileService;
import com.ibeetl.admin.core.web.JsonResult;
import com.ibeetl.jlw.entity.CourseInfo;
@ -26,8 +28,11 @@ import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.servlet.ModelAndView;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import static cn.hutool.core.util.ArrayUtil.join;
/**
* ResourcesInfo 接口
* 切记不要对非线程安全的静态变量进行写操作，增删改后，请使用@LoadInit重新加载
@ -125,8 +130,12 @@ public class ResourcesInfoController{
@PostMapping(MODEL + "/list.json")
@Function("resourcesInfo.query")
@ResponseBody
public JsonResult<PageQuery> list(ResourcesInfoQuery condition){
public JsonResult<PageQuery> list(ResourcesInfoQuery condition, @SCoreUser CoreUser coreUser){
PageQuery page = condition.getPageQuery();
if (coreUser.isUniAdmin()) {
condition.setOrgIdPlural(join(Arrays.asList(coreUser.getOrgId(), 1, null).toArray(), ","));
}
resourcesInfoService.queryByCondition(page);
return JsonResult.success(page);
}

6
web/src/main/java/com/ibeetl/jlw/web/ResourcesQuestionController.java
Unescape Escape View File

@ -46,6 +46,8 @@ import java.io.InputStream;
import java.math.BigDecimal;
import java.util.*;
import static cn.hutool.core.util.ArrayUtil.join;
/**
* ResourcesQuestion 接口
* 切记不要对非线程安全的静态变量进行写操作，增删改后，请使用@LoadInit重新加载
@ -146,6 +148,10 @@ public class ResourcesQuestionController{
if (coreUser.isTeacher()) {
condition.setSeeSelf(true);
}
if (coreUser.isUniAdmin()) {
condition.setOrgIdPlural(join(Arrays.asList(coreUser.getOrgId(), 1, null).toArray(), ","));
}
resourcesQuestionService.queryByCondition(page);
return JsonResult.success(page);
}

9
web/src/main/java/com/ibeetl/jlw/web/query/ResourcesInfoQuery.java
Unescape Escape View File

@ -38,6 +38,7 @@ public class ResourcesInfoQuery extends PageParam {
private String resourcesInfoIds;
private String courseInfoIds;
private String orgIdPlural;
public Long getResourcesInfoId(){
return resourcesInfoId;
@ -145,4 +146,12 @@ public class ResourcesInfoQuery extends PageParam {
public void setSeeSelf(Boolean seeSelf) {
this.seeSelf = seeSelf;
}
public void setOrgIdPlural(String orgIdPlural) {
this.orgIdPlural = orgIdPlural;
}
public String getOrgIdPlural() {
return orgIdPlural;
}
}

9
web/src/main/java/com/ibeetl/jlw/web/query/ResourcesQuestionQuery.java
Unescape Escape View File

@ -42,6 +42,7 @@ public class ResourcesQuestionQuery extends PageParam {
private Integer questionStatus;
@Query(name = "组织机构ID", display = false)
private Long orgId;
private String orgIdPlural;
@Query(name = "后台用户ID", display = false)
private Long userId;
@ -249,4 +250,12 @@ public class ResourcesQuestionQuery extends PageParam {
public void setSeeSelf(Boolean seeSelf) {
this.seeSelf = seeSelf;
}
public String getOrgIdPlural() {
return orgIdPlural;
}
public void setOrgIdPlural(String orgIdPlural) {
this.orgIdPlural = orgIdPlural;
}
}

11
web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseStudentSigninLogQuery.java
Unescape Escape View File

@ -42,6 +42,9 @@ public class TeacherOpenCourseStudentSigninLogQuery extends PageParam {
// 10 签到，20 缺勤
private SignInTypeEnum teacherOpenCourseStudentSigninLogTag;
// 查询条件：学生名字或者学生编号
private String studentSnOrName;
public String getTeacherOpenCourseStudentSigninSettingIdPlural() {
return teacherOpenCourseStudentSigninSettingIdPlural;
}
@ -220,4 +223,12 @@ public class TeacherOpenCourseStudentSigninLogQuery extends PageParam {
public void setTeacherOpenCourseStudentSigninSettingSessionTime(Date teacherOpenCourseStudentSigninSettingSessionTime) {
this.teacherOpenCourseStudentSigninSettingSessionTime = (teacherOpenCourseStudentSigninSettingSessionTime);
}
public String getStudentSnOrName() {
return studentSnOrName;
}
public void setStudentSnOrName(String studentSnOrName) {
this.studentSnOrName = studentSnOrName;
}
}

3
web/src/main/resources/sql/jlw/resourcesInfo.md
Unescape Escape View File

@ -36,6 +36,9 @@ queryByCondition
@if(!isEmpty(orgId)){
and t.org_id =#orgId#
@}
@if(!isEmpty(orgIdPlural)){
and find_in_set(t.org_id, #orgIdPlural#)
@}
@if(!isEmpty(addType)){
and t.add_type =#addType#
@}

3
web/src/main/resources/sql/jlw/resourcesQuestion.md
Unescape Escape View File

@ -78,6 +78,9 @@ queryByCondition
@if(!isEmpty(orgId)){
and t.org_id =#orgId#
@}
@if(!isEmpty(orgIdPlural)){
and find_in_set(t.org_id, #orgIdPlural#)
@}
@if(isEmpty(seeSelf) && !isEmpty(userId)){
and t.user_id =#userId#
@}

4
web/src/main/resources/sql/jlw/teacherOpenCourseStudentSigninLog.md
Unescape Escape View File

@ -6,6 +6,7 @@ queryByCondition
t.*
@}
from teacher_open_course_student_signin_log t
inner join student ta on ta.student_status = 1
where 1=1
@//数据权限，该sql语句功能点,如果不考虑数据权限，可以删除此行
and #function("teacherOpenCourseStudentSigninLog.query")#
@ -15,6 +16,9 @@ queryByCondition
@if(!isEmpty(teacherOpenCourseStudentSigninLogIdPlural)){
and find_in_set(t.teacher_open_course_student_signin_log_id,#teacherOpenCourseStudentSigninLogIdPlural#)
@}
@if(!isEmpty(studentSnOrName)){
and concat(ta.student_name, ta.student_sn) like #'%'+studentSnOrName+'%'#
@}
@if(!isEmpty(teacherOpenCourseStudentSigninSettingId)){
and t.teacher_open_course_student_signin_setting_id =#teacherOpenCourseStudentSigninSettingId#
@}

1
web/src/main/resources/sql/jlw/teacherOpenCourseStudentSigninSetting.md
Unescape Escape View File

@ -8,6 +8,7 @@ queryByCondition
t.*
@}
from teacher_open_course_student_signin_setting t
inner join student ta on ta.student_status = 1
where 1=1
@//数据权限，该sql语句功能点,如果不考虑数据权限，可以删除此行
and #function("teacherOpenCourseStudentSigninSetting.query")#

29
web/src/main/resources/static/js/jlw/teacherOpenCourseStudentSigninLog/index.js
Unescape Escape View File

@ -60,25 +60,22 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
hide: $.isEmpty(sx_['schoolClassIdText']) ? false : sx_['schoolClassIdText'],
},
{
field: 'teacherOpenCourseIdText', //数据字典类型为 teacher_open_course.teacher_open_course_title.teacher_open_course_status=1
title: '签到',
field: 'teacherOpenCourseStudentSigninLogTagText', //数据字典类型为 teacher_open_course.teacher_open_course_title.teacher_open_course_status=1
title: '状态',
align: "center",
hideField: false,
hide: $.isEmpty(sx_['teacherOpenCourseIdText']) ? false : sx_['teacherOpenCourseIdText'],
templet: function (d) {
return 1;
}
},
{
field: 'teacherOpenCourseIdText', //数据字典类型为 teacher_open_course.teacher_open_course_title.teacher_open_course_status=1
title: '缺勤',
align: "center",
hideField: false,
hide: $.isEmpty(sx_['teacherOpenCourseIdText']) ? false : sx_['teacherOpenCourseIdText'],
templet: function (d) {
return 1;
}
hide: $.isEmpty(sx_['teacherOpenCourseStudentSigninLogTagText']) ? false : sx_['teacherOpenCourseStudentSigninLogTagText'],
},
// {
// field: 'teacherOpenCourseIdText', //数据字典类型为 teacher_open_course.teacher_open_course_title.teacher_open_course_status=1
// title: '缺勤',
// align: "center",
// hideField: false,
// hide: $.isEmpty(sx_['teacherOpenCourseIdText']) ? false : sx_['teacherOpenCourseIdText'],
// templet: function (d) {
// return 1;
// }
// },
{
field: 'teacherOpenCourseStudentSigninLogRemark', //数据字典类型为 teacher_open_course.teacher_open_course_title.teacher_open_course_status=1
title: '缺勤理由',

Write Preview
Loading…
Cancel
Save