优化

src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/SystemUserOpController.java

@@ -155,9 +155,7 @@ public class SystemUserOpController {
     @ApiOperation(value = " 列表查询系统角色信息", notes = "列表查询系统角色信息", httpMethod="GET")
     @PostMapping(value = "/roleList")
     public Result<List<SystemRole>> roleList(@RequestBody SystemRole systemRole) {
-        List<SystemRole> list = systemRoleService.list(Wrappers.<SystemRole>lambdaQuery()
+        List<SystemRole> list = systemRoleService.getList(systemRole);
-                .eq(SystemRole::getSysDefault, 0)
-                .eq(SystemRole::getSn, systemRole.getSn()));
         return Result.success(list);
     }
 

src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemRoleServiceImpl.java

@@ -7,8 +7,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zhgd.jeecg.common.system.query.QueryGenerator;
 import com.zhgd.jeecg.common.util.PageUtil;
 import com.zhgd.xmgl.handler.exception.CustomException;
+import com.zhgd.xmgl.modules.basicdata.entity.EnterpriseMain;
 import com.zhgd.xmgl.modules.basicdata.entity.SystemRole;
 import com.zhgd.xmgl.modules.basicdata.entity.SystemRoleMenu;
+import com.zhgd.xmgl.modules.basicdata.mapper.EnterpriseMainMapper;
 import com.zhgd.xmgl.modules.basicdata.mapper.SystemRoleMapper;
 import com.zhgd.xmgl.modules.basicdata.mapper.SystemRoleMenuMapper;
 import com.zhgd.xmgl.modules.basicdata.service.IGovernmentService;
@@ -40,6 +42,9 @@ public class SystemRoleServiceImpl extends ServiceImpl<SystemRoleMapper, SystemR
     @Autowired
     private IGovernmentService governmentService;
 
+    @Autowired
+    private EnterpriseMainMapper enterpriseMainMapper;
+
     @Override
     public Page<SystemRole> pageList(Map<String, Object> map) {
         SecurityUser user = SecurityUtil.getUser();
@@ -50,7 +55,7 @@ public class SystemRoleServiceImpl extends ServiceImpl<SystemRoleMapper, SystemR
                 queryWrapper.eq("create_by", user.getUserId());
             }
         }
-        if (user.getAccountType() != 2) {
+        if (user.getAccountType() != 2 && (user.getAccountType() == 3 && !user.getEnterpriseMainList().contains(1))) {
             queryWrapper.lambda().eq(SystemRole::getSysDefault, 0);
         }
         queryWrapper.orderByAsc("priority");
@@ -67,9 +72,28 @@ public class SystemRoleServiceImpl extends ServiceImpl<SystemRoleMapper, SystemR
             systemRole.setSn(user.getSn());
         }
         QueryWrapper<SystemRole> queryWrapper = QueryGenerator.initQueryWrapper(systemRole);
-        queryWrapper.lambda().eq(SystemRole::getSysDefault, 0);
+//        if (user.getAccountType() != 2 || (user.getAccountType() == 3 && !user.getEnterpriseMainList().contains(1))) {
+//            queryWrapper.lambda().eq(SystemRole::getSysDefault, 0);
+//        }
         queryWrapper.orderByAsc("priority");
-        return this.list(queryWrapper);
+        List<SystemRole> list = this.list(queryWrapper);
+        List<EnterpriseMain> enterpriseMainList = enterpriseMainMapper.selectList(Wrappers.<EnterpriseMain>lambdaQuery().eq(EnterpriseMain::getEnterpriseSn, systemRole.getSn()));
+        for (EnterpriseMain main : enterpriseMainList) {
+            String code = "";
+            if (main.getMainType() == 1) {
+                code = "BUILD";
+            } else if (main.getMainType() == 2) {
+                code = "SUPERVISOR";
+            } else if (main.getMainType() == 3) {
+                code = "OP";
+            }
+            SystemRole systemRole1 = this.getOne(Wrappers.<SystemRole>lambdaQuery()
+                    .eq(SystemRole::getRoleCode, code));
+            if (systemRole1 != null) {
+                list.add(systemRole1);
+            }
+        }
+        return list;
     }
 
     @Override

src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/AttendanceRecordServiceImpl.java

@@ -8,6 +8,7 @@ import com.zhgd.xmgl.modules.wisdom.entity.AttendanceRecord;
 import com.zhgd.xmgl.modules.wisdom.mapper.AttendanceRecordMapper;
 import com.zhgd.xmgl.modules.wisdom.service.IAttendanceRecordService;
 import org.apache.commons.collections.MapUtils;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -31,8 +32,12 @@ public class AttendanceRecordServiceImpl extends ServiceImpl<AttendanceRecordMap
         String startTime = MapUtils.getString(map, "startTime");
         String endTime = MapUtils.getString(map, "endTime");
         LambdaQueryWrapper<AttendanceRecord> wrapper = Wrappers.<AttendanceRecord>lambdaQuery();
+        if (StringUtils.isNotBlank(startTime)) {
             wrapper.ge(AttendanceRecord::getDayDate, startTime);
+        }
+        if (StringUtils.isNotBlank(endTime)) {
             wrapper.le(AttendanceRecord::getDayDate, endTime);
+        }
         List<AttendanceRecord> list = baseMapper.selectList(wrapper);
         for (AttendanceRecord record : list) {
             Map<String, Object> resultMap = new HashMap<>();