移动端修复

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java

@@ -342,11 +342,9 @@ 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.eq("bmd.nodeState", FlowComment.SETTLE.getRemark());//已办结
         qw.eq("bmd.depositBillTypeKey", "01");
         return qw;

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;
 }

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());
 	}

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">

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/app/AppSysUserRest.java

@@ -81,7 +81,46 @@ public class AppSysUserRest implements AppSysUserFeign {
             if (StringUtils.isBlank(verifyCode)) return new ResultBean<SysUserVo>().fail().setMsg("验证码不能为空");
             // 访问后清理key
         }
-
+        boolean isTest = userQuery.isTest();
+        if (isTest) {//添加测试版
+            SysUser sysUser = sysUserService.selectByUserNameApp(userName);
+            if (sysUser == null) {
+                sysUser = sysUserService.selectByMobile(userName);
+                if (sysUser == null) {
+                    return rb.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 {
+                    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 {
             SysUser sysUser = sysUserService.selectByAppId(appId);
             if (null == sysUser) { // 未查询到绑定的账号
                 sysUser = sysUserService.selectByUserNameApp(userName);
@@ -163,6 +202,7 @@ public class AppSysUserRest implements AppSysUserFeign {
                 }
             }
         }
+    }
 
     /**
      * 插入登录日志