no message

mall-server-api/src/main/java/com/gree/mall/manager/controller/admin/AdminUserController.java

@@ -131,7 +131,7 @@ public class AdminUserController {
 
     @PostMapping("/password/reset")
     @ApiOperation("重置密码")
-    public ResponseHelper resetPwd(
+    public ResponseHelper resetPwd (
             @ApiParam(value = "用户id",required = true) @RequestParam(required = true) String adminUserId,
             @ApiParam(value = "密码",required = true) @RequestParam(required = true) String password,
             HttpServletRequest request

mall-server-api/src/main/java/com/gree/mall/manager/logic/admin/AdminUserLogic.java

@@ -148,7 +148,7 @@ public class AdminUserLogic {
 
         adminUserCom.setToken(token);
         //存放到redis
-        redisUtil.set(RedisPrefixEnum.TOKEN_MGR.toString() + adminUserCom.getToken(), adminUserCom, 20 * 60 * 60 * 1000);
+        redisUtil.set(RedisPrefixEnum.TOKEN_MGR + adminUserCom.getToken(), adminUserCom, 20 * 60 * 60 * 1000);
 
         bigLogic.addUserLog(adminUser.getAdminUserId());
 
@@ -162,8 +162,8 @@ public class AdminUserLogic {
      * @param adminUserCom
      */
     private void checkWebsitLevel2(AdminUser adminUser, AdminUserCom adminUserCom) {
+        adminUserCom.setIsJumpSign(false);
         if (CollectionUtil.isNotEmpty(adminUserCom.getAdminWebsitIds()) && adminUserCom.getAdminWebsitIds().size() == 1) {
-            adminUserCom.setIsJumpSign(false);
             final AdminWebsit websit = adminWebsitService.getById(adminUserCom.getAdminWebsitIds().get(0));
             // 二级网点
             if (websit.getLevel() == 2) {

mall-server-api/src/main/java/com/gree/mall/manager/logic/contract/WebsitContractSignLogic.java

@@ -144,7 +144,7 @@ public class WebsitContractSignLogic {
         long companySign = signItems.stream()
                 .filter(v -> v.getNeedCompanySign().equals(IsYesNoEnum.YES.getKey()) && v.getCompanySignStatus().equals(IsYesNoEnum.NO.getKey()))
                 .count();
-        if (!bean.isJump() && companySign > 0) {
+        if (!bean.isJump() && companySign > 0 && websit.getFadadaWebsitRealStatus().equals(IsYesNoEnum.YES.getKey())) {
             // 签约企业签约跳
             this.companySignMethod(websit, item, bean, returnUrl);
         }
@@ -154,7 +154,8 @@ public class WebsitContractSignLogic {
                 .count();
         if (!bean.isJump()
                 && companySign == 0
-                && managerSign > 0) {
+                && managerSign > 0
+                && websit.getFadadaCustomerRealStatus().equals(IsYesNoEnum.YES.getKey())) {
             // 签约负责人签约跳
             this.managerSignMethod(websit, item, bean, returnUrl);
         }