问题修改

src/main/java/com/dk/mdm/mapper/report/ReportMapper.xml

@@ -1032,7 +1032,7 @@
             ,tmc.cus_code AS "cusCode"
             ,tmc.cus_name  As "cusName"
             ,tmc.cus_phone  As "cusPhone"
-        FROM 
+        FROM
             dkic_b.t_psi_order tpo
         left join dkic_b.t_mst_customer tmc on tpo.cus_id = tmc.cus_id
         left join sys.t_data_kind as tdk1 on tpo.order_type = tdk1.kind_code

src/main/java/com/dk/mdm/service/mst/CustomerService.java

@@ -99,18 +99,16 @@ public class CustomerService extends BaseService<Customer> {
                     ErrorCodeEnum.CUSTOMER_SAME_COMPANY_TELEPHONE.getMessage());
         }
         List<String> followStaff = new ArrayList<>();
-        followStaff.add(authUtils.getStaff().getStaffId());
+        String staffId = authUtils.getStaff().getStaffId();
+        followStaff.add(staffId);
         customer.setFollowStaffs(followStaff);
         if (customer.getSaleStatus() == null) {
             //新建默认就是潜客
             customer.setSaleStatus(Constant.saleCustomerStatusConstant.SALE_STATUS_POTE.getName());
         }
-
-
-        //设置公司id
-//        customer.setCpId(authUtils.getStaff().getCpId());
+        
         //报备人
-        customer.setReportStaff(authUtils.getStaff().getStaffId());
+        customer.setReportStaff(staffId);
         //报备日期
         customer.setReportTime(LocalDateTime.now());
         ResponseResultVO<?> insert = super.insert(customer);

src/main/java/com/dk/mdm/service/mst/DictionaryDataService.java

@@ -45,9 +45,6 @@ public class DictionaryDataService extends BaseService<DictionaryData> {
 
 	@Autowired
 	private DictionaryDataConvert dictionaryDataConvert;
-
-	@Autowired
-	private MoneyAccountMapper moneyAccountMapper;
 	/**
 	 * @desc : 重写主键
 	 * @author : 于继渤
@@ -57,8 +54,6 @@ public class DictionaryDataService extends BaseService<DictionaryData> {
 	public String getPrimaryKey() {
 		return "data_id";
 	}
-
-
 	/**
 	 * @desc : 查询
 	 * @author : 于继渤
@@ -69,8 +64,6 @@ public class DictionaryDataService extends BaseService<DictionaryData> {
 		return super.mergeListWithCount(dictionaryDataQuery, dictionaryDataMapper.selectByCond(dictionaryDataQuery),
 				dictionaryDataMapper.countByCond(dictionaryDataQuery));
 	}
-
-
 	public ResponseResultVO<Long> countByCondMoneyAccount(String id) {
 		Long aLong = dictionaryDataMapper.countByCondMoneyAccount(id);
 		return ResponseResultUtil.success(aLong);
@@ -98,9 +91,6 @@ public class DictionaryDataService extends BaseService<DictionaryData> {
 		dictionaryDataMapper.insert(dictionaryData);
 		return ResponseResultUtil.success();
 	}
-
-
-
 	/**
 	 * @desc : 编辑
 	 * @author : 于继渤
@@ -121,10 +111,7 @@ public class DictionaryDataService extends BaseService<DictionaryData> {
 			//默认  把其他置为非默认
 			dictionaryDataMapper.updateFlgDefault(new DictionaryDataQuery().setCpId(dictionaryData1.getCpId()).setDictCode(dictionaryData1.getDictCode()));
 		}
-
-
 		super.updateByUuid(dictionaryData);
-
 		return ResponseResultUtil.success();
 	}
 
@@ -162,7 +149,6 @@ public class DictionaryDataService extends BaseService<DictionaryData> {
 			return ResponseResultUtil.error(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.SYSTEM_PRESET_DATA_UNABLE_TO_OPERATE.getMessage());
 		}
 		super.enable(id);
-
 		return ResponseResultUtil.success();
 	}
 

src/main/java/com/dk/mdm/service/mst/RoleService.java

@@ -98,7 +98,11 @@ public class RoleService extends BaseService<Role> {
 
         return ResponseResultUtil.success();
     }
-
+    /**
+     * @desc : 设置功能权限敏感数据
+     * @author : 于继渤
+     * @date : 2023/1/5 9:39
+     */
     private void setRoleItem(RoleVo roleVO, Role role) {
         if (roleVO.getRoleFunList() != null && roleVO.getRoleFunList().size() > 0 && roleVO.getRoleFunList().get(0).getFunUuid() != null) {
             //新建角色功能权限