|
|
@@ -1,5 +1,6 @@
|
|
|
package com.dk.mdm.service.mst;
|
|
|
|
|
|
+import com.alibaba.fastjson.JSON;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.dk.common.exception.BaseBusinessException;
|
|
|
import com.dk.common.infrastructure.annotaiton.Pagination;
|
|
|
@@ -12,6 +13,7 @@ import com.dk.common.model.vo.core.StaffEntity;
|
|
|
import com.dk.common.response.ResponseCodeEnum;
|
|
|
import com.dk.common.response.ResponseResultUtil;
|
|
|
import com.dk.common.response.ResponseResultVO;
|
|
|
+import com.dk.common.util.AESUtil;
|
|
|
import com.dk.mdm.feign.CompanyFeign;
|
|
|
import com.dk.mdm.feign.UserFeign;
|
|
|
import com.dk.mdm.infrastructure.convert.mst.StaffConvert;
|
|
|
@@ -126,6 +128,16 @@ public class StaffService extends BaseService<Staff> {
|
|
|
Integer cpId = authUtils.getStaff().getCpId();
|
|
|
staffQuery.setCpId(cpId);
|
|
|
}
|
|
|
+// Map<String,Object> map = new HashMap<>();
|
|
|
+// map.put("grade_code","STD");
|
|
|
+// map.put("end_date","2099-09-01");
|
|
|
+// map.put("web_max_num",1);
|
|
|
+// map.put("wx_max_num",1);
|
|
|
+// String s1 = JSON.toJSONString(map);
|
|
|
+// // 加密
|
|
|
+// String s = AESUtil.aesEncrypt(s1);
|
|
|
+// // 解密
|
|
|
+// Map<String,Object> ss = JSON.parseObject(AESUtil.desEncrypt(s),Map.class) ;
|
|
|
return super.mergeListWithCount(staffQuery, staffMapper.selectByCond(staffQuery),
|
|
|
staffMapper.countByCond(staffQuery));
|
|
|
}
|
zhoux