From be30e1a60ac85fefd145be424deb0d1dc546e224 Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Mon, 5 Dec 2022 18:56:17 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BusSalesOrderDepositService.java          |   4 +-
 .../portal/api/sysuser/SysUserQuery.java      |   6 +-
 .../portal/biz/appversion/AppVersionRest.java |   2 +
 .../SysMobileMenuRoleMapper.xml               |   3 +-
 .../biz/sysuser/app/AppSysUserRest.java       | 178 +++++++++++-------
 5 files changed, 116 insertions(+), 77 deletions(-)

diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java
index 649095548c..8bbefb47f3 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java
@@ -342,9 +342,7 @@ public class BusSalesOrderDepositService extends MybatisBaseService<BusSalesOrde
             //查询已审核通过的款项确认
             ResultBean<List<String>> stringList = finCollectionConfirmationFeign.billeNoList();
             if(stringList.getSuccess()){
-                if(!stringList.getData().isEmpty()){
-                    qw.in("bmd.billNo",stringList.getData());
-                }
+                qw.in("bmd.billNo",stringList.getData());
             }
         }
         qw.eq("bmd.nodeState", FlowComment.SETTLE.getRemark());//已办结
diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserQuery.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserQuery.java
index f4251e343b..39a79e4fa8 100644
--- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserQuery.java
+++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserQuery.java
@@ -1,15 +1,11 @@
 package com.yxt.anrui.portal.api.sysuser;
 
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.common.core.query.Query;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.servlet.http.HttpServletRequest;
-import java.util.Date;
-
 /**
  * Project: anrui_portal(门户建设) <br/>
  * File: SysUserQuery.java <br/>
@@ -50,4 +46,6 @@ public class SysUserQuery implements Query {
     private String appId;
     @ApiModelProperty("手机登录类型：1、密码登录2、验证码登录")
     private String type;
+    @ApiModelProperty("是否是测试")
+    private boolean isTest;
 }
\ No newline at end of file
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/appversion/AppVersionRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/appversion/AppVersionRest.java
index 0517025741..8ee4c35b93 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/appversion/AppVersionRest.java
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/appversion/AppVersionRest.java
@@ -111,6 +111,8 @@ public class AppVersionRest implements AppVersionFeign {
 //		sendMessage(appVersionDto);
 		AppVersionMessageDto appVersionMessageDto = new AppVersionMessageDto();
 		BeanUtil.copyProperties(appVersionDto,appVersionMessageDto);
+		List<String> list = sysUserService.selectAllUserSid();
+		appVersionMessageDto.setReceiveSids(list);
 		ResultBean appMessage = messageFeign.sendAppVersionMessage(appVersionMessageDto);
 		return ResultBean.fireSuccess().setMsg(resultBean.getMsg());
 	}
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmobilemenurole/SysMobileMenuRoleMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmobilemenurole/SysMobileMenuRoleMapper.xml
index 349ac7b12d..962e899994 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmobilemenurole/SysMobileMenuRoleMapper.xml
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmobilemenurole/SysMobileMenuRoleMapper.xml
@@ -30,10 +30,11 @@
     </delete>
 
     <select id="getApp" resultType="com.yxt.anrui.portal.api.index.AppIndexNewVo">
-        select titleGroup as title
+        select titleGroup as title, id
         from sys_mobile_menu
         where linkSid = #{appSid}
         group by titleGroup
+        order by id asc
     </select>
 
     <!-- <resultMap id="appRoleMenu" type="com.yxt.anrui.portal.api.index.AppIndexNewVo">
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/app/AppSysUserRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/app/AppSysUserRest.java
index f534683914..15cfa7e68f 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/app/AppSysUserRest.java
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/app/AppSysUserRest.java
@@ -81,85 +81,125 @@ public class AppSysUserRest implements AppSysUserFeign {
             if (StringUtils.isBlank(verifyCode)) return new ResultBean<SysUserVo>().fail().setMsg("验证码不能为空");
             // 访问后清理key
         }
-
-        SysUser sysUser = sysUserService.selectByAppId(appId);
-        if (null == sysUser) { // 未查询到绑定的账号
-            sysUser = sysUserService.selectByUserNameApp(userName);
+        boolean isTest = userQuery.isTest();
+        if (isTest) {//添加测试版
+            SysUser sysUser = sysUserService.selectByUserNameApp(userName);
             if (sysUser == null) {
                 sysUser = sysUserService.selectByMobile(userName);
                 if (sysUser == null) {
                     return rb.setMsg("账号不存在");
                 }
             }
-            String appIdVal = sysUser.getAppId();
-            if (StringUtils.isBlank(appIdVal)) { // 设备值为空
-                if (type.equals("1")) {
-                    String md5 = Encodes.md5(password);
-                    if (md5.equals(sysUser.getPassword())) {
-                        sysUserService.updateAppId(sysUser.getSid(), appId);
-                        SysUserVo sysUserVo = sysUserService.selectUser(sysUser);
-                        if(sysUserVo == null){
-                            return rb.setMsg("该用户不是公司员工");
-                        }
-                        insertLoginLog(sysUser);
-                        return new ResultBean<SysUserVo>().success().setData(sysUserVo);
-                    } else {
-                        return new ResultBean<SysUserVo>().fail().setMsg("用户名或密码错误");
+            if (type.equals("1")) {
+                String md5 = Encodes.md5(password);
+                if (md5.equals(sysUser.getPassword())) {
+                    sysUserService.updateAppId(sysUser.getSid(), appId);
+                    SysUserVo sysUserVo = sysUserService.selectUser(sysUser);
+                    if (sysUserVo == null) {
+                        return rb.setMsg("该用户不是公司员工");
                     }
+                    insertLoginLog(sysUser);
+                    return new ResultBean<SysUserVo>().success().setData(sysUserVo);
                 } else {
-                    String codeFromRedis = redisUtil.get("loginCode" + userName);
-                    if (StringUtils.isBlank(codeFromRedis))
-                        return new ResultBean<SysUserVo>().fail().setMsg("短信验证码已失效，请重新发送");
-                    if (verifyCode.equals(codeFromRedis.substring(0, 4))) {
-                        sysUserService.updateAppId(sysUser.getSid(), appId);
-                        SysUserVo sysUserVo = sysUserService.selectUser(sysUser);
-                        if(sysUserVo == null){
-                            return rb.setMsg("该用户不是公司员工");
-                        }
-                        redisUtil.remove("loginCode" + userName);
-                        insertLoginLog(sysUser);
-                        return new ResultBean<SysUserVo>().success().setData(sysUserVo);
-                    } else {
-                        return new ResultBean<SysUserVo>().fail().setMsg("短信验证码错误或已失效，请重新获取");
+                    return new ResultBean<SysUserVo>().fail().setMsg("用户名或密码错误");
+                }
+            } else {
+                String codeFromRedis = redisUtil.get("loginCode" + userName);
+                if (StringUtils.isBlank(codeFromRedis))
+                    return new ResultBean<SysUserVo>().fail().setMsg("短信验证码已失效，请重新发送");
+                if (verifyCode.equals(codeFromRedis.substring(0, 4))) {
+                    sysUserService.updateAppId(sysUser.getSid(), appId);
+                    SysUserVo sysUserVo = sysUserService.selectUser(sysUser);
+                    if (sysUserVo == null) {
+                        return rb.setMsg("该用户不是公司员工");
                     }
+                    redisUtil.remove("loginCode" + userName);
+                    insertLoginLog(sysUser);
+                    return new ResultBean<SysUserVo>().success().setData(sysUserVo);
+                } else {
+                    return new ResultBean<SysUserVo>().fail().setMsg("短信验证码错误或已失效，请重新获取");
                 }
-            } else { // 设备值存在
-                int res = insertSysExceptionLog("b", JSON.toJSON(userQuery).toString(), "当前账号已被其它设备绑定");
-                return new ResultBean<SysUserVo>().fail().setMsg("当前账号已被其它设备绑定（错误码：" + res + ")");
             }
-        } else { // 查询到绑定的账号
-            if (userName.equals(sysUser.getUserName()) || userName.equals(sysUser.getMobile())) { // 设备appId一致,验证用户名
-                if (type.equals("1")) {
-                    String md5 = Encodes.md5(password);
-                    if (md5.equals(sysUser.getPassword())) {
-                        SysUserVo sysUserVo = sysUserService.selectUser(sysUser);
-                        if(sysUserVo == null){
-                            return rb.setMsg("该用户不是公司员工");
+        } else {
+            SysUser sysUser = sysUserService.selectByAppId(appId);
+            if (null == sysUser) { // 未查询到绑定的账号
+                sysUser = sysUserService.selectByUserNameApp(userName);
+                if (sysUser == null) {
+                    sysUser = sysUserService.selectByMobile(userName);
+                    if (sysUser == null) {
+                        return rb.setMsg("账号不存在");
+                    }
+                }
+                String appIdVal = sysUser.getAppId();
+                if (StringUtils.isBlank(appIdVal)) { // 设备值为空
+                    if (type.equals("1")) {
+                        String md5 = Encodes.md5(password);
+                        if (md5.equals(sysUser.getPassword())) {
+                            sysUserService.updateAppId(sysUser.getSid(), appId);
+                            SysUserVo sysUserVo = sysUserService.selectUser(sysUser);
+                            if (sysUserVo == null) {
+                                return rb.setMsg("该用户不是公司员工");
+                            }
+                            insertLoginLog(sysUser);
+                            return new ResultBean<SysUserVo>().success().setData(sysUserVo);
+                        } else {
+                            return new ResultBean<SysUserVo>().fail().setMsg("用户名或密码错误");
                         }
-                        insertLoginLog(sysUser);
-                        return new ResultBean<SysUserVo>().success().setData(sysUserVo);
                     } else {
-                        return new ResultBean<SysUserVo>().fail().setMsg("用户名或密码错误");
+                        String codeFromRedis = redisUtil.get("loginCode" + userName);
+                        if (StringUtils.isBlank(codeFromRedis))
+                            return new ResultBean<SysUserVo>().fail().setMsg("短信验证码已失效，请重新发送");
+                        if (verifyCode.equals(codeFromRedis.substring(0, 4))) {
+                            sysUserService.updateAppId(sysUser.getSid(), appId);
+                            SysUserVo sysUserVo = sysUserService.selectUser(sysUser);
+                            if (sysUserVo == null) {
+                                return rb.setMsg("该用户不是公司员工");
+                            }
+                            redisUtil.remove("loginCode" + userName);
+                            insertLoginLog(sysUser);
+                            return new ResultBean<SysUserVo>().success().setData(sysUserVo);
+                        } else {
+                            return new ResultBean<SysUserVo>().fail().setMsg("短信验证码错误或已失效，请重新获取");
+                        }
                     }
-                } else {
-                    String codeFromRedis = redisUtil.get("loginCode" + userName);
-                    if (StringUtils.isBlank(codeFromRedis))
-                        return new ResultBean<SysUserVo>().fail().setMsg("短信验证码已失效，请重新发送");
-                    if (verifyCode.equals(codeFromRedis.substring(0, 4))) {
-                        SysUserVo sysUserVo = sysUserService.selectUser(sysUser);
-                        if(sysUserVo == null){
-                            return rb.setMsg("该用户不是公司员工");
+                } else { // 设备值存在
+                    int res = insertSysExceptionLog("b", JSON.toJSON(userQuery).toString(), "当前账号已被其它设备绑定");
+                    return new ResultBean<SysUserVo>().fail().setMsg("当前账号已被其它设备绑定（错误码：" + res + ")");
+                }
+            } else { // 查询到绑定的账号
+                if (userName.equals(sysUser.getUserName()) || userName.equals(sysUser.getMobile())) { // 设备appId一致,验证用户名
+                    if (type.equals("1")) {
+                        String md5 = Encodes.md5(password);
+                        if (md5.equals(sysUser.getPassword())) {
+                            SysUserVo sysUserVo = sysUserService.selectUser(sysUser);
+                            if (sysUserVo == null) {
+                                return rb.setMsg("该用户不是公司员工");
+                            }
+                            insertLoginLog(sysUser);
+                            return new ResultBean<SysUserVo>().success().setData(sysUserVo);
+                        } else {
+                            return new ResultBean<SysUserVo>().fail().setMsg("用户名或密码错误");
                         }
-                        redisUtil.remove("loginCode" + userName);
-                        insertLoginLog(sysUser);
-                        return new ResultBean<SysUserVo>().success().setData(sysUserVo);
                     } else {
-                        return new ResultBean<SysUserVo>().fail().setMsg("短信验证码错误或已失效，请重新获取");
+                        String codeFromRedis = redisUtil.get("loginCode" + userName);
+                        if (StringUtils.isBlank(codeFromRedis))
+                            return new ResultBean<SysUserVo>().fail().setMsg("短信验证码已失效，请重新发送");
+                        if (verifyCode.equals(codeFromRedis.substring(0, 4))) {
+                            SysUserVo sysUserVo = sysUserService.selectUser(sysUser);
+                            if (sysUserVo == null) {
+                                return rb.setMsg("该用户不是公司员工");
+                            }
+                            redisUtil.remove("loginCode" + userName);
+                            insertLoginLog(sysUser);
+                            return new ResultBean<SysUserVo>().success().setData(sysUserVo);
+                        } else {
+                            return new ResultBean<SysUserVo>().fail().setMsg("短信验证码错误或已失效，请重新获取");
+                        }
                     }
+                } else { // 用户名不一致
+                    int res = insertSysExceptionLog("a", JSON.toJSON(userQuery).toString(), "当前设备已绑定其它账号");
+                    return new ResultBean<SysUserVo>().fail().setMsg("当前设备已绑定其它账号（错误码：" + res + ")");
                 }
-            } else { // 用户名不一致
-                int res = insertSysExceptionLog("a", JSON.toJSON(userQuery).toString(), "当前设备已绑定其它账号");
-                return new ResultBean<SysUserVo>().fail().setMsg("当前设备已绑定其它账号（错误码：" + res + ")");
             }
         }
     }
@@ -204,7 +244,7 @@ public class AppSysUserRest implements AppSysUserFeign {
             SysUser sysUser = sysUserService.selectByUserNameApp(mobile);
             if (null == sysUser) {
                 sysUser = sysUserService.selectByMobile(mobile);
-                if(sysUser == null){
+                if (sysUser == null) {
                     return new ResultBean().fail().setMsg("该手机号暂时还未注册，请先注册");
                 }
 
@@ -215,7 +255,7 @@ public class AppSysUserRest implements AppSysUserFeign {
                 sysUser = sysUserService.selectByUserNameApp(mobile);
                 if (sysUser == null) {
                     sysUser = sysUserService.selectByMobile(mobile);
-                    if(sysUser == null){
+                    if (sysUser == null) {
                         return new ResultBean().fail().setMsg("该手机号暂时还未注册，请先注册");
                     }
                 }
@@ -294,20 +334,20 @@ public class AppSysUserRest implements AppSysUserFeign {
         userInfo.setId("ID：" + sysUserVo.getJobNumber());
         //根据组织机构sid查询该用户的职位以及分公司的部门
         List<String> strings = new ArrayList<>();
-        List<SysStaffOrg> list = sysUserService.selectOrgBySid(orgPath,sysUserVo.getStaffSid());
-        for (SysStaffOrg s : list){
+        List<SysStaffOrg> list = sysUserService.selectOrgBySid(orgPath, sysUserVo.getStaffSid());
+        for (SysStaffOrg s : list) {
             String orgName = s.getOrgName();
             strings.add(orgName);
         }
         strings.removeAll(Collections.singleton(null));
-        if(!strings.isEmpty()){
-            userInfo.setDepartment(String.join("|",strings));
+        if (!strings.isEmpty()) {
+            userInfo.setDepartment(String.join("|", strings));
         }
         //根据用户sid查询岗位
         List<String> stringList = sysUserService.getPost(sysUserVo.getStaffSid());
         stringList.removeAll(Collections.singleton(null));
-        if(!stringList.isEmpty()){
-            userInfo.setPosition(String.join("|",stringList));
+        if (!stringList.isEmpty()) {
+            userInfo.setPosition(String.join("|", stringList));
         }
         return new ResultBean().success().setData(userInfo);
     }