|
|
@@ -82,7 +82,7 @@ public class AchievementOrderServiceImpl extends BaseMybatisDao<AchievementOrder
|
|
|
@Override
|
|
|
public int updateShutdownByUser(AchievementOrder order) {
|
|
|
order.setStatus(AchievementOrderStatus.SHUTDOWN.getCode());
|
|
|
-
|
|
|
+
|
|
|
AchievementOrderLog aol = new AchievementOrderLog();
|
|
|
aol.setId(UUID.randomUUID().toString());
|
|
|
aol.setStatus(AchievementOrderStatus.SHUTDOWN.getCode());
|
|
|
@@ -129,7 +129,7 @@ public class AchievementOrderServiceImpl extends BaseMybatisDao<AchievementOrder
|
|
|
return (Pagination<OrgAchievementOrderListBo>) findPage("findOrgAchievementOrderListByPage",
|
|
|
"findOrgAchievementOrderCount", disposeAchievementOrder(uid, null, unitName, status, true), pNo, pSize);
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
@Override
|
|
|
public int updateAchievementOrder(AchievementOrder achievementOrder, AchievementOrderLog aol,
|
|
|
String recordTimeFormattedDate) {
|
|
|
@@ -148,7 +148,6 @@ public class AchievementOrderServiceImpl extends BaseMybatisDao<AchievementOrder
|
|
|
return achievementOrderMapper.updateByPrimaryKeySelective(achievementOrder);
|
|
|
}
|
|
|
|
|
|
-
|
|
|
private Map<String, Object> disposeAchievementOrder(String uid, String username, String unitName, Integer status,
|
|
|
Boolean flag) {
|
|
|
Map<String, Object> params = new HashMap<>();
|
|
|
@@ -170,7 +169,9 @@ public class AchievementOrderServiceImpl extends BaseMybatisDao<AchievementOrder
|
|
|
}
|
|
|
|
|
|
if (flag) {
|
|
|
- params.put("techBrokerId", TokenManager.getAdminId());
|
|
|
+ if (!TokenManager.hasRole(AFTConstants.SUPERADMIN)) {
|
|
|
+ params.put("techBrokerId", TokenManager.getAdminId());
|
|
|
+ }
|
|
|
} else {
|
|
|
params.put("uid", TokenManager.getUserId());
|
|
|
}
|
|
|
@@ -178,5 +179,4 @@ public class AchievementOrderServiceImpl extends BaseMybatisDao<AchievementOrder
|
|
|
return params;
|
|
|
}
|
|
|
|
|
|
-
|
|
|
}
|