|
@@ -716,14 +716,18 @@ public class GyDataServiceImpl implements GyDataService {
|
|
return 0;
|
|
return 0;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+ UserDO currUser = ShiroUtils.getUser();
|
|
String auditStage =null;
|
|
String auditStage =null;
|
|
if("1".equals(deployType)){ //市级单独部署
|
|
if("1".equals(deployType)){ //市级单独部署
|
|
auditStage = "1";
|
|
auditStage = "1";
|
|
} else if("2".equals(deployType)){ //省级单独部署
|
|
} else if("2".equals(deployType)){ //省级单独部署
|
|
auditStage = "2";
|
|
auditStage = "2";
|
|
} else if("3".equals(deployType)){ //省市一体部署
|
|
} else if("3".equals(deployType)){ //省市一体部署
|
|
- auditStage = "1";
|
|
|
|
|
|
+ if (managerValue.contains(currUser.getDeptId().toString())) { //机构是管理员
|
|
|
|
+ auditStage = "1";
|
|
|
|
+ } else { //一般省级人员
|
|
|
|
+ auditStage = "2";
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
|
|
return gyDataDao.recover(id, auditStage);
|
|
return gyDataDao.recover(id, auditStage);
|