Browse Source

财务结算-政策列表法务审核意见修改

yangzian 3 years ago
parent
commit
c4059b07f9

+ 1 - 1
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/controller/CwjsPolicyInfoController.java

@@ -387,7 +387,7 @@ public class CwjsPolicyInfoController {
 				//政策当前审核人 = 最后一个审核人 = 当前用户   && 状态不为3 审核通过  && 状态不为4 审核拒绝  ||  当前用户 不是老板
 				// 则显示 转领导审批
 				if(cwjsPolicy.getApprovedStatus() != 3 && cwjsPolicy.getApprovedStatus() != 4){
-					if (cwjsPolicy.getApprovedProgress().equals(directorUserId) && directorUserId.equals(userId)
+					if (StringUtils.equals(cwjsPolicy.getApprovedProgress(),directorUserId) && directorUserId.equals(userId)
 							&& !"80e747cdea6f41dbbc8cde23046fd4e0".equals(userId)){
 						cwjsPolicy.setTheBossRight("yes");
 					}

+ 1 - 0
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/mapper/xml/CwjsPolicyInfoMapper.xml

@@ -368,6 +368,7 @@
             LEFT JOIN `jeecg-boot`.sys_role r ON r.id = ur.role_id
         WHERE
         p.id = #{policyId}
+        ORDER BY id
     </select>