|
|
@@ -1183,7 +1183,8 @@ public class StockLandService extends BaseService<StockLand> {
|
|
|
}else if(type == 15||type == 14){
|
|
|
//简易流程会签
|
|
|
if(null != approval){
|
|
|
- String nextChecker = approval.getNextchecker();
|
|
|
+// String nextChecker = approval.getNextchecker();
|
|
|
+ String nextChecker = getNextLevelCheckerByDepartment(ShiroUtils.getUserId(),approval.getNextchecker());
|
|
|
//2.找出下一审核人
|
|
|
String [] nextCheckerArr = nextChecker.split(",");
|
|
|
if(null != nextCheckerArr && nextCheckerArr.length > 0){
|
|
|
@@ -1286,7 +1287,6 @@ public class StockLandService extends BaseService<StockLand> {
|
|
|
* @param stockLand
|
|
|
* @param approval_round
|
|
|
* @param approved
|
|
|
- * @param approved2
|
|
|
*/
|
|
|
private void doApproval(StockLandApprovalDto slad, int id, String comment, StockLand stockLand, Integer approval_round, String approved, String operaType) {
|
|
|
stockLand.setApprove_status(approved);
|