用户选择组件修改、发起流程时调整实例标题

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/invoice/controller/CwFinanceInvoiceController.java

@@ -11,6 +11,7 @@ import com.jeeplus.core.excel.utils.EasyPoiUtil;
 import com.jeeplus.sys.constant.enums.LogTypeEnum;
 import com.jeeplus.sys.utils.DictUtils;
 import com.jeeplus.sys.utils.StringUtils;
+import com.jeeplus.test.cw.invoice.domain.CwFinanceInvoice;
 import com.jeeplus.test.cw.invoice.service.CwFinanceInvoiceService;
 import com.jeeplus.test.cw.invoice.service.dto.CwFinanceDTO;
 import com.jeeplus.test.cw.invoice.service.dto.CwFinanceInvoiceDTO;
@@ -112,8 +113,11 @@ public class CwFinanceInvoiceController {
     @PreAuthorize("hasAnyAuthority('cw_finance:invoice:add','cw_finance:invoice:edit')")
     @PostMapping("saveForm")
     public ResponseEntity saveForm(@Valid @RequestBody CwFinanceInvoiceDTO cwFinanceInvoiceDTO) throws Exception {
-        String id = cwFinanceInvoiceService.saveForm(cwFinanceInvoiceDTO);
-        return ResponseUtil.newInstance().add("businessTable", "cw_finance_invoice").add("businessId", id).ok ("操作成功");
+        CwFinanceInvoice cwFinanceInvoice = cwFinanceInvoiceService.saveForm(cwFinanceInvoiceDTO);
+        return ResponseUtil.newInstance().add("businessTable", "cw_finance_invoice")
+                .add("businessId", cwFinanceInvoice.getId())
+                .add("no", cwFinanceInvoice.getNo())
+                .ok ("操作成功");
     }
 
     /**

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/invoice/service/CwFinanceInvoiceService.java

@@ -281,7 +281,7 @@ public class CwFinanceInvoiceService extends ServiceImpl<CwFinanceInvoiceMapper,
         return cwFinanceInvoiceDTO;
     }
 
-    public String saveForm(CwFinanceInvoiceDTO cwFinanceInvoiceDTO) throws Exception{
+    public CwFinanceInvoice saveForm(CwFinanceInvoiceDTO cwFinanceInvoiceDTO) throws Exception{
         CwFinanceInvoice cwFinanceInvoice = CwFinanceInvoiceWrapper.INSTANCE.toEntity(cwFinanceInvoiceDTO);
         if (ObjectUtil.isNotEmpty(cwFinanceInvoice)) {
             if(StringUtils.isBlank(cwFinanceInvoice.getId())){
@@ -404,7 +404,7 @@ public class CwFinanceInvoiceService extends ServiceImpl<CwFinanceInvoiceMapper,
                 cwFinanceInvoiceInvalidMapper.insert(cwFinanceInvoiceInvalid);
             }
         }
-        return cwFinanceInvoice.getId();
+        return cwFinanceInvoice;
     }
 
     public ResponseEntity saveInvoice(CwFinanceInvoiceDTO cwFinanceInvoiceDTO) throws Exception{
@@ -413,7 +413,7 @@ public class CwFinanceInvoiceService extends ServiceImpl<CwFinanceInvoiceMapper,
     }
 
     public String saveFormInvalid(CwFinanceInvoiceDTO cwFinanceInvoiceDTO) throws Exception{
-        String invoiceId = this.saveForm(cwFinanceInvoiceDTO);
+        String invoiceId = this.saveForm(cwFinanceInvoiceDTO).getId();
         List<CwFinanceInvoiceInvalid> cwFinanceInvoiceInvalids = cwFinanceInvoiceInvalidMapper.selectList(
                 new QueryWrapper<CwFinanceInvoiceInvalid>().lambda().eq(CwFinanceInvoiceInvalid::getInvoiceId, invoiceId));
         return cwFinanceInvoiceInvalids.get(0).getId();

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/reimbursementApproval/approvalInfo/controller/CwReimbursementInfoController.java

@@ -8,6 +8,7 @@ import com.jeeplus.core.excel.ExcelOptions;
 import com.jeeplus.core.excel.ExportMode;
 import com.jeeplus.core.excel.utils.EasyPoiUtil;
 import com.jeeplus.sys.constant.enums.LogTypeEnum;
+import com.jeeplus.test.cw.reimbursementApproval.approvalInfo.domain.CwReimbursementInfo;
 import com.jeeplus.test.cw.reimbursementApproval.approvalInfo.service.CwReimbursementInfoService;
 import com.jeeplus.test.cw.reimbursementApproval.approvalInfo.service.dto.*;
 import com.jeeplus.test.program.configuration.projectList.domain.ProgramProjectListInfo;
@@ -81,8 +82,11 @@ public class CwReimbursementInfoController {
     @ApiOperation(value = "新增、修改")
     @PostMapping("/save")
     public ResponseEntity<String> save(@RequestBody SaveInfoDto dto) throws Exception{
-        String s = service.save(dto);
-        return ResponseUtil.newInstance().add("businessTable", "cw_reimbursement_info").add("businessId", s).ok ("操作成功");
+        CwReimbursementInfo s = service.save(dto);
+        return ResponseUtil.newInstance().add("businessTable", "cw_reimbursement_info")
+                .add("businessId", s.getId())
+                .add("no", s.getNo())
+                .ok ("操作成功");
     }
 
     /**

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/reimbursementApproval/approvalInfo/service/CwReimbursementInfoService.java

@@ -224,7 +224,7 @@ public class CwReimbursementInfoService {
         return pageList;
     }
 
-    public String save(SaveInfoDto dto) throws Exception{
+    public CwReimbursementInfo save(SaveInfoDto dto) throws Exception{
         // 获取当前登录人信息
         UserDTO userDTO = UserUtils.getCurrentUserDTO();
         if (StringUtils.isNotEmpty(dto.getId())) {
@@ -234,7 +234,7 @@ public class CwReimbursementInfoService {
         }
     }
 
-    public String add(SaveInfoDto dto, UserDTO userDTO) throws Exception{
+    public CwReimbursementInfo add(SaveInfoDto dto, UserDTO userDTO) throws Exception{
         // 生成id
         String id = UUID.randomUUID().toString().replace("-", "");
         // 生成编号
@@ -310,10 +310,10 @@ public class CwReimbursementInfoService {
         if (CollectionUtils.isNotEmpty(dto.getFiles())) {
             infoService.saveFiles(dto.getFiles(), userDTO, id);
         }
-        return id;
+        return info;
     }
 
-    public String update(SaveInfoDto dto, UserDTO userDTO) {
+    public CwReimbursementInfo update(SaveInfoDto dto, UserDTO userDTO) {
         // 修改基础信息
         CwReimbursementInfo info = new CwReimbursementInfo();
         BeanUtils.copyProperties(dto, info);
@@ -411,7 +411,7 @@ public class CwReimbursementInfoService {
         if (CollectionUtils.isNotEmpty(dto.getFiles())) {
             infoService.updateFiles(dto.getFiles(), userDTO, dto.getId());
         }
-        return dto.getId();
+        return info;
     }
 
     public String remove(String id) {

jeeplus-platform/jeeplus-admin/src/main/java/com/jeeplus/sys/controller/UserController.java

@@ -43,6 +43,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.core.parameters.P;
+import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -165,14 +166,19 @@ public class UserController {
         if (!UserUtils.getCurrentUserDTO().isAdmin()) {
             queryWrapper.isNull("a.is_admin");
             if (ObjectUtil.isNotEmpty(userDTO)){
-                // 当不是精确的部门查询时，再添加下面的筛选条件
-                if (ObjectUtil.isNotEmpty(userDTO.getOfficeDTO()) && ObjectUtil.isEmpty(userDTO.getCompanyDTO())) {
-                    if(StringUtils.isBlank(userDTO.getOfficeDTO().getId())){
+                if (ObjectUtil.isNotEmpty(userDTO.getCompanyDTO()) && ObjectUtil.isNotEmpty(userDTO.getOfficeDTO())) {
+                    // 当不是精确的部门查询时，再添加下面的筛选条件
+                    if ((StringUtils.isNotBlank(userDTO.getCompanyDTO().getId()) && StringUtils.isBlank(userDTO.getOfficeDTO().getId()))
+                            || "true".equals(userDTO.getSelectAll())) {
+                        // officeDTO.id是空，companyDTO.id不是空的话，说明前端组件点击的集团来进行查询
+                        // selectAll为‘true’的话，说明前端没有选择集团或者部门查询，这个时候要展示全部人员
                         // 根据当前用户的部门id找到此部门的ids
                         String ids = officeService.getById(UserUtils.getCurrentUserDTO().getOfficeDTO().getId()).getParentIds();
                         // 根据ids分隔后的index[2],找到当前用户的所属公司id
                         String companyId = null;
                         String[] split = ids.split(",");
+                        // split.length大于2，说明当前登录人所属部门是普通部门，展示部分人员信息
+                        // 否则，当前登录人所属公共类部门（忘了叫什么类部门了，就是总经办那种部门），展示全部人员信息
                         if(split.length>2){
                             companyId = split[2];
                             // 根据公司id,找到此公司下的所有部门
@@ -188,11 +194,10 @@ public class UserController {
                             List<String> lastIds = officeIdList.stream().distinct().collect(Collectors.toList());
                             // 添加筛选条件为这些部门的id
                             queryWrapper.in("a.office_id",lastIds);
-                        }else{
-                            companyId = UserUtils.getCurrentUserDTO().getOfficeDTO().getId();
-                            // 添加筛选条件为当前登录人部门的id
-                            queryWrapper.eq("a.office_id",companyId);
                         }
+                    } else if(StringUtils.isBlank(userDTO.getCompanyDTO().getId()) && StringUtils.isNotBlank(userDTO.getOfficeDTO().getId())) {
+                        // officeDTO.id不是空，companyDTO.id是空的话，说明前端组件点击的部门查询
+                        queryWrapper.eq("a.office_id",userDTO.getOfficeDTO().getId());
                     }
                 }
             }

jeeplus-platform/jeeplus-admin/src/main/java/com/jeeplus/sys/service/dto/UserDTO.java

@@ -190,6 +190,11 @@ public class  UserDTO extends BaseDTO {
     private String certType;
 
     /**
+     * 前端组件传‘true’则查询全部
+     */
+    private String selectAll;
+
+    /**
      * 拥有角色列表
      */
     @ApiModelProperty(hidden = true)