fix: [试验管理] 查询bug

hxhq-common/hxhq-common-core/src/main/java/com/hxhq/common/core/utils/poi/ExcelUtil.java

@@ -259,7 +259,7 @@ public class ExcelUtil
                 if (Collection.class.isAssignableFrom(field.getType()))
                 {
                     Cell cell = subRow.createCell(column);
-                    cell.setCellValue(ServletUtils.getRequest().getHeader("lang").equals("zh_CN")?attr.name():attr.nameEn());
+                    cell.setCellValue("zh_CN".equals(ServletUtils.getRequest().getHeader("lang"))?attr.name():attr.nameEn());
                     cell.setCellStyle(cellStyle);
                     int subFieldSize = subFieldsMap != null ? subFieldsMap.get(field.getName()).size() : 0;
                     if (subFieldSize > 1)
@@ -272,7 +272,7 @@ public class ExcelUtil
                 else
                 {
                     Cell cell = subRow.createCell(column++);
-                    cell.setCellValue(ServletUtils.getRequest().getHeader("lang").equals("zh_CN")?attr.name():attr.nameEn());
+                    cell.setCellValue("zh_CN".equals(ServletUtils.getRequest().getHeader("lang"))?attr.name():attr.nameEn());
                     cell.setCellStyle(cellStyle);
                 }
             }
@@ -844,7 +844,7 @@ public class ExcelUtil
         // 创建列
         Cell cell = row.createCell(column);
         // 写入列信息
-        cell.setCellValue(ServletUtils.getRequest().getHeader("lang").equals("zh_CN")?attr.name():attr.nameEn());
+        cell.setCellValue("zh_CN".equals(ServletUtils.getRequest().getHeader("lang"))?attr.name():attr.nameEn());
         setDataValidation(attr, row, column);
         cell.setCellStyle(styles.get(StringUtils.format("header_{}_{}", attr.headerColor(), attr.headerBackgroundColor())));
         if (isSubList())

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/SystemLogController.java

@@ -71,9 +71,9 @@ public class SystemLogController extends BaseController
         List<SystemLog> list = systemLogService.queryList(form);
         for(SystemLog l : list){
             l.setCzsj(DateUtils.parseDateToStr(l.getCreateTime()==null?"": DateUtils.YYYY_MM_DD_HH_MM_SS,l.getCreateTime()));
-            l.setCzlx(ServletUtils.getRequest().getHeader("lang").equals("zh_CN")?l.getJcmc():l.getJcmcEn());
+            l.setCzlx("zh_CN".equals(ServletUtils.getRequest().getHeader("lang"))?l.getJcmc():l.getJcmcEn());
             String czxq = "";
-            if(ServletUtils.getRequest().getHeader("lang").equals("zh_CN")){
+            if("zh_CN".equals(ServletUtils.getRequest().getHeader("lang"))){
                 try{
                     JSONArray jsonArray = JSONArray.parseArray(l.getJcnr());
                     for(int i=0;i<jsonArray.size();i++){

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyServiceImpl.java

@@ -71,7 +71,7 @@ public class StudyServiceImpl extends ServiceImpl implements
             queryWrapper.like("s.sn",form.getSn());
         }
         if(StringUtils.isNoneBlank(form.getLeaderName())){
-            queryWrapper.like("u.nick_name",form.getLeaderName());
+            queryWrapper.like("s.`leader_name`",form.getLeaderName());
         }
         if (StringUtils.isNoneBlank(form.getStartDate())) {
             queryWrapper.ge("s.create_time", form.getStartDate());

hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/controller/SysDictDataController.java

@@ -61,7 +61,8 @@ public class SysDictDataController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(SysDictData dictData)
     {
-        if(StringUtils.equals(dictData.getDictType(), "business_ccwz")) {
+        String ccwz = "business_ccwz";
+        if(StringUtils.equals(dictData.getDictType(),ccwz)) {
             YqSearchForm form = new YqSearchForm();
             List<SysDept> superiorAndSubordinate = sysDeptService.getSuperiorAndSubordinate(SecurityUtils.getLoginUser().getSysUser().getDeptId());
             List<Long> deptIdList = superiorAndSubordinate.stream().map(SysDept::getDeptId).collect(Collectors.toList());

hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/controller/SysLogininforController.java

@@ -70,9 +70,9 @@ public class SysLogininforController extends BaseController
         for(SysLogininfor l:list){
             SystemLog systemLog = new SystemLog();
             systemLog.setQmrMc(l.getNickName());
-            systemLog.setCzlx(ServletUtils.getRequest().getHeader("lang").equals("zh_CN")?"登录":"Login");
+            systemLog.setCzlx("zh_CN".equals(ServletUtils.getRequest().getHeader("lang"))?"登录":"Login");
             systemLog.setCzsj(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,l.getAccessTime()));
-            systemLog.setCzxq(ServletUtils.getRequest().getHeader("lang").equals("zh_CN")?l.getMsg():l.getMsgEn());
+            systemLog.setCzxq("zh_CN".equals(ServletUtils.getRequest().getHeader("lang"))?l.getMsg():l.getMsgEn());
             logList.add(systemLog);
         }
         ExcelUtil<SystemLog> util = new ExcelUtil<SystemLog>(SystemLog.class);

hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/controller/SysRoleController.java

@@ -81,7 +81,7 @@ public class SysRoleController extends BaseController
     {
         List<SysRole> list = roleService.selectRoleList(role);
         for(SysRole l : list){
-            l.setStatusText("0".endsWith(l.getStatus())?(ServletUtils.getRequest().getHeader("lang").equals("zh_CN")?"启用":"Enabled"):(ServletUtils.getRequest().getHeader("lang").equals("zh_CN")?"禁用":"Disabled"));
+            l.setStatusText("0".endsWith(l.getStatus())?("zh_CN".equals(ServletUtils.getRequest().getHeader("lang"))?"启用":"Enabled"):("zh_CN".equals(ServletUtils.getRequest().getHeader("lang"))?"禁用":"Disabled"));
         }
         ExcelUtil<SysRole> util = new ExcelUtil<SysRole>(SysRole.class);
         util.exportExcel(response, list, "角色数据");

hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/controller/SysUserController.java

@@ -118,7 +118,7 @@ public class SysUserController extends BaseController
             exportDto.setDeptName(u.getDept()==null?"":u.getDept().getDeptName());
             exportDto.setRoleName(getRoleName(u.getRoles()));
 
-            exportDto.setStatus("0".endsWith(u.getStatus())?(ServletUtils.getRequest().getHeader("lang").equals("zh_CN")?"启用":"Enabled"):(ServletUtils.getRequest().getHeader("lang").equals("zh_CN")?"禁用":"Disabled"));
+            exportDto.setStatus("0".endsWith(u.getStatus())?("zh_CN".equals(ServletUtils.getRequest().getHeader("lang"))?"启用":"Enabled"):("zh_CN".equals(ServletUtils.getRequest().getHeader("lang"))?"禁用":"Disabled"));
             userList.add(exportDto);
         }
         ExcelUtil<UserExportDto> util = new ExcelUtil<UserExportDto>(UserExportDto.class);

hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/service/impl/SysMenuServiceImpl.java

@@ -635,7 +635,8 @@ public class SysMenuServiceImpl implements ISysMenuService
         if(menus!=null && menus.size()>0){
             SysMenu firstMenu = menus.get(0);
             urlList.add(firstMenu.getPath());
-            if(!firstMenu.getMenuType().equals("C")){
+            String menu = "C";
+            if(!menu.equals(firstMenu.getMenuType())){
                 urlList = getChildUrl(urlList,firstMenu.getChildren());
             }
         }

hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/service/impl/SysUserServiceImpl.java

@@ -647,9 +647,7 @@ public class SysUserServiceImpl implements ISysUserService
     private List<SystemLog> getModifyLogList(SysUser info, SignForm sign){
         SysUser old = selectUserById(info.getUserId());
         List<Long> oldRoleIdList = roleMapper.selectRoleListByUserId(info.getUserId());
-
         List<SystemLog> list = new ArrayList<>();
-
         List<ObjectCompareUtil.FieldChange> fieldChanges = ObjectCompareUtil.compareObjects(old, info);
         for (ObjectCompareUtil.FieldChange fieldChange : fieldChanges) {
             SystemLog log = getLogInfo(old);
@@ -672,7 +670,6 @@ public class SysUserServiceImpl implements ISysUserService
             log.setJcnrEn("[{\"name\":\"Field\",\"value\":\"Department\"},{\"name\":\"Old Value\",\"value\":\""+oldDept.getDeptName()+"\"},{\"name\":\"New Value\",\"value\":\""+newDept.getDeptName()+"\"}]");
             list.add(log);
         }
-
         //判断菜单修改
         Boolean updateRole = false;
         if(info.getRoleIds().length!=oldRoleIdList.size()){
@@ -687,9 +684,7 @@ public class SysUserServiceImpl implements ISysUserService
         }
         if(updateRole){
             checkPassword(SecurityUtils.getLoginUser().getSysUser(),sign.getQmrmm(),false);
-
             List<SysRole> allRoleList = roleMapper.selectRoleList(new SysRole());
-
             List<SysRole> oldRoleList = new ArrayList<>();
             List<SysRole> newRoleList = new ArrayList<>();
             if(info.getRoleIds()!=null && info.getRoleIds().length>0){
@@ -702,10 +697,8 @@ public class SysUserServiceImpl implements ISysUserService
                     oldRoleList.add(allRoleList.stream().filter(o->o.getRoleId().equals(oldRoleId)).collect(Collectors.toList()).get(0));
                 }
             }
-
             List<String> oldRoleNameList = oldRoleList.stream().map(o->o.getRoleName()).collect(Collectors.toList());
             List<String> bghList = oldRoleList.stream().map(o->o.getRoleName()).collect(Collectors.toList());
-
             List<String> addNameList = new ArrayList<>();
             List<String> deleteNameList = new ArrayList<>();
             for(SysRole newRole : newRoleList){
@@ -714,7 +707,6 @@ public class SysUserServiceImpl implements ISysUserService
                     bghList.add(newRole.getRoleName());
                 }
             }
-
             List<Long> newMenuIdList = Arrays.asList(info.getRoleIds());
             for(SysRole oldRole : oldRoleList){
                 if(!newMenuIdList.contains(oldRole.getRoleId())){
@@ -722,7 +714,6 @@ public class SysUserServiceImpl implements ISysUserService
                     bghList.remove(oldRole.getRoleName());
                 }
             }
-
             if(addNameList.size()>0 || deleteNameList.size()>0){
                 SystemLog log = getLogInfo(old);
                 log.setJcnr((addNameList.size()>0?("新增角色："+String.join(",",addNameList)):"")+(deleteNameList.size()>0?("；删除角色："+String.join(",",deleteNameList)):"")+(StringUtils.isBlank(sign.getRemark())?"":"；备注："+sign.getRemark()));
@@ -731,7 +722,6 @@ public class SysUserServiceImpl implements ISysUserService
             }
             roleChangeService.saveInfo(info.getUserId(),String.join(",",oldRoleNameList),String.join(",",bghList),sign.getRemark());
         }
-
         return list;
     }