金华交投 冲突解决

src/com/engine/salary/entity/salaryBill/param/SalaryBillGetTokenParam.java

@@ -23,4 +23,6 @@ public class SalaryBillGetTokenParam {
     // 老 未加密
     private String recipient;
 
+    private Long id;
+
 }

src/com/engine/salary/entity/salaryacct/param/SalaryAcctEmployeeQueryParam.java

@@ -68,7 +68,7 @@ public class SalaryAcctEmployeeQueryParam extends BaseQueryParam {
     private Set<Date> salaryMonths;
 
 
-    private Collection<Long> salaryAcctRecordIds;
+    // private Collection<Long> salaryAcctRecordIds;
     private Collection<Long> salarySobIds;
     private Collection<Long> employeeIds;
 

src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java

@@ -71,6 +71,7 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.BeanUtils;
 import org.springframework.util.StopWatch;
 import weaver.file.ImageFileManager;
+import weaver.general.Util;
 import weaver.hrm.User;
 
 import java.io.InputStream;

src/com/engine/salary/util/SalaryTokenUtil.java

@@ -79,18 +79,30 @@ public class SalaryTokenUtil {
      * @return
      */
     public static Map<String, String> GetToken(SalaryBillGetTokenParam param)  {
+        Map<String, String> heads = new HashMap<>();
         String uid = "";
+        BaseBean baseBean = new BaseBean();
+        RecordSet rs = new RecordSet();
         if (StringUtils.isNotBlank(param.getSalaryCode())) {
             uid = AESEncryptUtil.decrypt4SalaryBill(param.getSalaryCode());
         } else {
             uid = param.getRecipient();
+            // 校验id
+            if (param.getId() == null) {
+                return heads;
+            }
+            String correctUid = "";
+            rs.execute("select employee_id as eid from hrsa_salary_send_info where id = " + param.getId());
+            if (rs.next()) {
+                correctUid = rs.getString("eid");
+            }
+            if (StringUtils.isBlank(correctUid) || StringUtils.isBlank(uid) || (!correctUid.equals(uid))) {
+                return heads;
+            }
         }
-        Map<String, String> heads = new HashMap<>();
         if (StringUtils.isBlank(uid)) {
             return heads;
         }
-        BaseBean baseBean = new BaseBean();
-        RecordSet rs = new RecordSet();
         Map<String, String> resultMap = new HashMap<>();
 
         // 获取appid的id

src/com/engine/salary/wrapper/SalaryAcctResultWrapper.java

@@ -231,8 +231,8 @@ public class SalaryAcctResultWrapper extends Service implements SalaryAcctResult
         log.info("开始核算V1{}", calculateParam);
 
         //报表参数
-        List<DataCollectionEmployee> emps = getSalaryEmployeeService(user).listAllForReport();
-        calculateParam.setEmps(SalaryEntityUtil.convert2Map(emps, DataCollectionEmployee::getEmployeeId));
+        // List<DataCollectionEmployee> emps = getSalaryEmployeeService(user).listAllForReport();
+        // calculateParam.setEmps(SalaryEntityUtil.convert2Map(emps, DataCollectionEmployee::getEmployeeId));
 
         // 校验是否可以编辑
         SalaryAcctRecordPO salaryAcctRecordPO = getSalaryAcctRecordService(user).getById(calculateParam.getSalaryAcctRecordId());