fix:用户修改

yun-admin/src/main/java/net/lab1024/sa/admin/module/service/domain/form/ServiceDepartmentImportForm.java

@@ -27,12 +27,14 @@ public class ServiceDepartmentImportForm {
     private Double quarterlyServiceDuration = 0.0;
 
     @ExcelProperty("季度累计服务成本")
+    @ExcelIgnore
     private BigDecimal quarterlyServiceCost = BigDecimal.ZERO;
 
     @ExcelProperty("年度累计服务时长")
     private Double annualServiceDuration = 0.0;
 
     @ExcelProperty("年度累计服务成本")
+    @ExcelIgnore
     private BigDecimal annualServiceCost = BigDecimal.ZERO;
 
 }

yun-admin/src/main/java/net/lab1024/sa/admin/module/service/domain/form/ServiceLawyerImportForm.java

@@ -30,11 +30,13 @@ public class ServiceLawyerImportForm {
     private Double quarterlyServiceDuration = 0.0;
 
     @ExcelProperty("季度累计服务成本")
+    @ExcelIgnore
     private BigDecimal quarterlyServiceCost = BigDecimal.ZERO;
 
     @ExcelProperty("年度累计服务时长")
     private Double annualServiceDuration = 0.0;
 
     @ExcelProperty("年度累计服务成本")
+    @ExcelIgnore
     private BigDecimal annualServiceCost = BigDecimal.ZERO;
 }

yun-admin/src/main/java/net/lab1024/sa/admin/module/service/service/ServiceApplicationsService.java

@@ -227,7 +227,11 @@ public class ServiceApplicationsService {
      */
     public ResponseDTO<String> add(ServiceApplicationsAddForm addForm) {
         ServiceApplicationsEntity serviceApplicationsEntity = SmartBeanUtil.copy(addForm, ServiceApplicationsEntity.class);
+        if(addForm.getApplicationId() == null) {
             serviceApplicationsDao.insert(serviceApplicationsEntity);
+        }else {
+            serviceApplicationsDao.updateById(serviceApplicationsEntity);
+        }
         return ResponseDTO.ok();
     }
 
@@ -1016,6 +1020,13 @@ public class ServiceApplicationsService {
      * @param queryForm
      */
     public void exportLawyer(ServiceLawyerQueryForm queryForm, HttpServletResponse response) {
+        RequestEmployee requestUser = AdminRequestUtil.getRequestUser();
+        RoleVO roleList = roleEmployeeService.getRoleIdList(requestUser.getEmployeeId()).get(0);
+        if (UserTypeEnum.USER.getDesc().equals(roleList.getRoleCode())){
+            queryForm.setUserId(requestUser.getEmployeeId());
+        }else if (UserTypeEnum.CTO.getDesc().equals(roleList.getRoleCode())){
+            queryForm.setFirmId(requestUser.getDepartmentId());
+        }
         DictEntity one = dictService.getOne("FILECOST");
         // 如果没有指定季度，则使用年度范围，否则使用季度范围
         if (queryForm.getQuarter() == null) {