Merge branch 'V20230915' of http://192.168.60.201/root/dsk-operate-sys into V20230915

dsk-admin/src/main/resources/application-prod.yml

@@ -190,3 +190,4 @@ sms:
     territory: ap-guangzhou
 
 dsk:
+  exportBackUrl: https://szhapi.jiansheku.com/export/backUrl
\ No newline at end of file

dsk-module/dsk-biz-api/src/main/java/com/dsk/search/controller/ExportController.java

@@ -52,7 +52,6 @@ public class ExportController {
     public AjaxResult enterpriseInfoExport(@RequestBody JSONObject object) {
         ComposeQueryDto compose = JSONObject.parseObject(object.toJSONString(), ComposeQueryDto.class);
         if (null==compose.getAptitudeQueryDto()
-                ||CollectionUtils.isEmpty(compose.getAptitudeQueryDto().getAptitudeDtoList())
                 || !ObjectUtils.hasValueThroughObj(compose.getAptitudeQueryDto(), null, Arrays.asList("and", "or", "yes", "no", "level", "qualification", "new", "only"))) {
             return AjaxResult.warn("导出筛选条件为空！");
         }
@@ -60,6 +59,7 @@ public class ExportController {
             object.put("exportExeclName","企业基本信息导出");
         }
         object.put("exportTemplateName","szh-enterprise-info.xlsx");
+        object.put("exportStartRow",3);
         return exportService.enterpriseInfoExport(object);
     }
 
@@ -70,14 +70,14 @@ public class ExportController {
     public AjaxResult enterpriseAptitudeExport(@RequestBody JSONObject object) {
         ComposeQueryDto compose = JSONObject.parseObject(object.toJSONString(), ComposeQueryDto.class);
         if (null==compose.getAptitudeQueryDto()
-                ||CollectionUtils.isEmpty(compose.getAptitudeQueryDto().getAptitudeDtoList())
-                || !ObjectUtils.hasValueThroughObj(compose.getAptitudeQueryDto().getAptitudeDtoList().get(0), null, Arrays.asList("and", "or", "yes", "no", "level", "qualification", "new", "only"))) {
+                || !ObjectUtils.hasValueThroughObj(compose.getAptitudeQueryDto(), null, Arrays.asList("and", "or", "yes", "no", "level", "qualification", "new", "only"))) {
             return AjaxResult.warn("导出筛选条件为空！");
         }
         if (StringUtils.isEmpty(compose.getExportExeclName())){
             object.put("exportExeclName","企业资质信息导出");
         }
         object.put("exportTemplateName","szh-cert-info.xlsx");
+        object.put("exportStartRow",3);
         return exportService.enterpriseAptitudeExport(object);
     }
 

dsk-module/dsk-biz-api/src/main/java/com/dsk/search/service/ExportService.java

@@ -46,7 +46,7 @@ public class ExportService {
     //企业基本信息导出
     public AjaxResult enterpriseInfoExport(JSONObject object) {
         SysUserFileRecord fileRecord = new SysUserFileRecord();
-        fileRecord.setFileName(object.get("exportExeclName").toString());
+        fileRecord.setFileName(object.get("exportExeclName").toString().concat(Constants.SUFFIX_XLSX));
         fileRecord.setType(1);
         //生成中
         fileRecord.setStatus(2);
@@ -62,7 +62,7 @@ public class ExportService {
     //企业资质导出
     public AjaxResult enterpriseAptitudeExport(JSONObject object) {
         SysUserFileRecord fileRecord = new SysUserFileRecord();
-        fileRecord.setFileName(object.get("exportExeclName").toString());
+        fileRecord.setFileName(object.get("exportExeclName").toString().concat(Constants.SUFFIX_XLSX));
         fileRecord.setType(1);
         //生成中
         fileRecord.setStatus(2);
@@ -78,7 +78,7 @@ public class ExportService {
     //重点项目清单
     public AjaxResult importantExport(JSONObject object) {
         SysUserFileRecord fileRecord = new SysUserFileRecord();
-        fileRecord.setFileName(object.get("exportExeclName").toString());
+        fileRecord.setFileName(object.get("exportExeclName").toString().concat(Constants.SUFFIX_XLSX));
         fileRecord.setType(1);
         //生成中
         fileRecord.setStatus(2);
@@ -94,7 +94,7 @@ public class ExportService {
     //集团成员导出
     public AjaxResult memberListExport(JskCombineSearchDto dto) {
         SysUserFileRecord fileRecord = new SysUserFileRecord();
-        fileRecord.setFileName(dto.getExportExeclName());
+        fileRecord.setFileName(dto.getExportExeclName().concat(Constants.SUFFIX_XLSX));
         fileRecord.setType(1);
         //生成中
         fileRecord.setStatus(2);
@@ -110,7 +110,7 @@ public class ExportService {
     //集团中标业绩导出
     public AjaxResult exportWinBid(JskCombineSearchDto dto) {
         SysUserFileRecord fileRecord = new SysUserFileRecord();
-        fileRecord.setFileName(dto.getExportExeclName());
+        fileRecord.setFileName(dto.getExportExeclName().concat(Constants.SUFFIX_XLSX));
         fileRecord.setType(1);
         //生成中
         fileRecord.setStatus(2);
@@ -126,7 +126,7 @@ public class ExportService {
     //集团招标业绩
     public AjaxResult exportBid(JskCombineSearchDto dto) {
         SysUserFileRecord fileRecord = new SysUserFileRecord();
-        fileRecord.setFileName(dto.getExportExeclName());
+        fileRecord.setFileName(dto.getExportExeclName().concat(Constants.SUFFIX_XLSX));
         fileRecord.setType(1);
         //生成中
         fileRecord.setStatus(2);

dsk-system/src/main/java/com/dsk/system/service/impl/SysRoleServiceImpl.java

@@ -406,15 +406,15 @@ public class SysRoleServiceImpl implements ISysRoleService {
      */
     @Override
     public int deleteAuthUser(SysUserRole userRole) {
+        //校验企业管理员角色下是否至少有一个账号
+        checkAdminHasUsers(userRole.getRoleId());
+
         //若该账号仅有一个角色,则不允许取消授权
         SysUser sysUser = userMapper.selectUserById(userRole.getUserId());
         if (sysUser.getRoles().size() == 1) {
             throw new ServiceException("至少保留一个角色在该账号下");
         }
 
-        //校验企业管理员角色下是否至少有一个账号
-        checkAdminHasUsers(userRole.getRoleId());
-
         int rows = userRoleMapper.delete(new LambdaQueryWrapper<SysUserRole>()
                 .eq(SysUserRole::getRoleId, userRole.getRoleId())
                 .eq(SysUserRole::getUserId, userRole.getUserId()));
@@ -433,6 +433,9 @@ public class SysRoleServiceImpl implements ISysRoleService {
      */
     @Override
     public int deleteAuthUsers(Long roleId, Long[] userIds) {
+        //校验企业管理员角色下是否至少有一个账号
+        Integer users = checkAdminHasUsers(roleId);
+
         //若该账号仅有一个角色,则不允许取消授权
         StringBuilder lackRoleAccount = new StringBuilder();
         for (Long userId : userIds) {
@@ -441,13 +444,12 @@ public class SysRoleServiceImpl implements ISysRoleService {
                 lackRoleAccount.append(sysUser.getUserName()).append(",");
             }
         }
+
         //将缺少角色的账号返回给前端
         if (lackRoleAccount.toString().contains(",")) {
             throw new ServiceException(lackRoleAccount.substring(0, lackRoleAccount.length()-1));
         }
 
-        //校验企业管理员角色下是否至少有一个账号
-        Integer users = checkAdminHasUsers(roleId);
         //如果取消授权企业管理员角色下所有账号,则抛异常
         if (users != null && userIds.length == users) {
             throw new ServiceException("至少要保留一个账号在企业管理员角色下!");