|
@@ -44,6 +44,7 @@ import com.qunzhixinxi.hnqz.admin.service.WmTaskSubmissionPercentRuleService;
|
|
import com.qunzhixinxi.hnqz.admin.service.WmTaskSubmissionRuleService;
|
|
import com.qunzhixinxi.hnqz.admin.service.WmTaskSubmissionRuleService;
|
|
import com.qunzhixinxi.hnqz.common.core.constant.CacheConstants;
|
|
import com.qunzhixinxi.hnqz.common.core.constant.CacheConstants;
|
|
import com.qunzhixinxi.hnqz.common.core.constant.CommonConstants;
|
|
import com.qunzhixinxi.hnqz.common.core.constant.CommonConstants;
|
|
|
|
+import com.qunzhixinxi.hnqz.common.core.util.IDUtils;
|
|
import com.qunzhixinxi.hnqz.common.core.util.R;
|
|
import com.qunzhixinxi.hnqz.common.core.util.R;
|
|
import com.qunzhixinxi.hnqz.common.data.datascope.DataScope;
|
|
import com.qunzhixinxi.hnqz.common.data.datascope.DataScope;
|
|
import com.qunzhixinxi.hnqz.common.security.util.SecurityUtils;
|
|
import com.qunzhixinxi.hnqz.common.security.util.SecurityUtils;
|
|
@@ -142,7 +143,7 @@ public class WmDaAgentServiceImpl extends ServiceImpl<WmDaAgentMapper, WmDaAgent
|
|
if (SecurityUtils.getRoles().contains(3)) {
|
|
if (SecurityUtils.getRoles().contains(3)) {
|
|
if (CollUtil.isEmpty(list)) {
|
|
if (CollUtil.isEmpty(list)) {
|
|
SysDept sysDept = new SysDept();
|
|
SysDept sysDept = new SysDept();
|
|
- sysDept.setDeptId((int) System.currentTimeMillis() / 1000);
|
|
|
|
|
|
+ sysDept.setDeptId(IDUtils.getId());
|
|
sysDept.setName(wmDaAgent.getGsmc());
|
|
sysDept.setName(wmDaAgent.getGsmc());
|
|
sysDept.setTaxCode(wmDaAgent.getZjNumber());
|
|
sysDept.setTaxCode(wmDaAgent.getZjNumber());
|
|
sysDept.setLevel(3);
|
|
sysDept.setLevel(3);
|
|
@@ -177,7 +178,7 @@ public class WmDaAgentServiceImpl extends ServiceImpl<WmDaAgentMapper, WmDaAgent
|
|
} else if (SecurityUtils.getRoles().contains(4)) {
|
|
} else if (SecurityUtils.getRoles().contains(4)) {
|
|
if (CollUtil.isEmpty(list)) {
|
|
if (CollUtil.isEmpty(list)) {
|
|
SysDept sysDept = new SysDept();
|
|
SysDept sysDept = new SysDept();
|
|
- sysDept.setDeptId((int) System.currentTimeMillis() / 1000);
|
|
|
|
|
|
+ sysDept.setDeptId(IDUtils.getId());
|
|
sysDept.setName(wmDaAgent.getGsmc());
|
|
sysDept.setName(wmDaAgent.getGsmc());
|
|
sysDept.setLevel(4);
|
|
sysDept.setLevel(4);
|
|
sysDept.setTaxCode(wmDaAgent.getZjNumber());
|
|
sysDept.setTaxCode(wmDaAgent.getZjNumber());
|
|
@@ -293,7 +294,7 @@ public class WmDaAgentServiceImpl extends ServiceImpl<WmDaAgentMapper, WmDaAgent
|
|
int deptId;
|
|
int deptId;
|
|
if (list3.size() == 0) {
|
|
if (list3.size() == 0) {
|
|
SysDept sysDept = new SysDept();
|
|
SysDept sysDept = new SysDept();
|
|
- sysDept.setDeptId((int) System.currentTimeMillis() / 1000);
|
|
|
|
|
|
+ sysDept.setDeptId(IDUtils.getId());
|
|
sysDept.setTaxCode(wmDaAgent.getZjNumber());
|
|
sysDept.setTaxCode(wmDaAgent.getZjNumber());
|
|
sysDept.setDeptPermissions(wmDaAgent.getDeptPermissions());
|
|
sysDept.setDeptPermissions(wmDaAgent.getDeptPermissions());
|
|
sysDept.setFinancialReviewType(wmDaAgent.getFinancialReviewType());
|
|
sysDept.setFinancialReviewType(wmDaAgent.getFinancialReviewType());
|