Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehuchaxun/vehicleSelect.vue

@@ -94,7 +94,7 @@
 <script>
 import Pagination from '@/components/pagination'
 import { sendFinCustomerTrue, vehicleCrmList } from '@/api/jichuxinxi/crmcustomer'
-import { typeValues, getPathSidByUserSid } from '@/api/dictcommons/dictcommons'
+import { typeValues, getOrgSidByPath } from '@/api/dictcommons/dictcommons'
 
 export default {
   name: 'vehicleSelect',
@@ -143,7 +143,7 @@ export default {
     },
     init() {
       this.shujuzidian()
-      getPathSidByUserSid({ userSid: window.sessionStorage.getItem('userSid') }).then((resp) => {
+      getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((resp) => {
         if (resp.success) {
           this.listQuery.params.createOrgSid = resp.data
           this.getList()

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.xml

@@ -125,14 +125,15 @@
                      left join sys_staffinfo si on si.sid = su.staffSid
         where su.userName = #{param1}
           and su.isDelete = 0
-          and su.userType = 1
+          and su.userType = 1 and si.personTypeKey != '01'
     </select>
     <select id="selectByAppId" resultType="com.yxt.anrui.portal.api.sysuser.SysUser">
-        SELECT *
+        SELECT su.*
-        FROM sys_user
+        FROM sys_user su
+        left join sys_staffinfo si on si.sid = su.staffSid
         where appId = #{appId}
           and isDelete = 0
-          and userType = 1
+          and userType = 1 and si.personTypeKey != '01'
     </select>
     <select id="fetchByUserName" resultType="com.yxt.anrui.portal.api.sysuser.SysUser">
         SELECT *

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

@@ -100,7 +100,7 @@ public class AppSysUserRest implements AppSysUserFeign {
             if (sysUser == null) {
                 sysUser = sysUserService.selectByMobile(userName);
                 if (sysUser == null) {
-                    return rb.setMsg("账号不存在");
+                    return rb.setMsg("用户名或密码错误");
                 }
             }
             if (type.equals("1")) {
@@ -109,7 +109,7 @@ public class AppSysUserRest implements AppSysUserFeign {
                     sysUserService.updateAppId(sysUser.getSid(), appId);
                     SysUserVo sysUserVo = sysUserService.selectUser(sysUser);
                     if (sysUserVo == null) {
-                        return rb.setMsg("该用户不是公司员工");
+                        return rb.setMsg("用户名或密码错误");
                     }
                     insertLoginLog(sysUser);
                     return new ResultBean<SysUserVo>().success().setData(sysUserVo);
@@ -124,7 +124,7 @@ public class AppSysUserRest implements AppSysUserFeign {
                     sysUserService.updateAppId(sysUser.getSid(), appId);
                     SysUserVo sysUserVo = sysUserService.selectUser(sysUser);
                     if (sysUserVo == null) {
-                        return rb.setMsg("该用户不是公司员工");
+                        return rb.setMsg("用户名或密码错误");
                     }
                     redisUtil.remove("loginCode" + userName);
                     insertLoginLog(sysUser);
@@ -140,7 +140,7 @@ public class AppSysUserRest implements AppSysUserFeign {
                 if (sysUser == null) {
                     sysUser = sysUserService.selectByMobile(userName);
                     if (sysUser == null) {
-                        return rb.setMsg("账号不存在");
+                        return rb.setMsg("用户名或密码错误");
                     }
                 }
                 String appIdVal = sysUser.getAppId();
@@ -151,7 +151,7 @@ public class AppSysUserRest implements AppSysUserFeign {
                             sysUserService.updateAppId(sysUser.getSid(), appId);
                             SysUserVo sysUserVo = sysUserService.selectUser(sysUser);
                             if (sysUserVo == null) {
-                                return rb.setMsg("该用户不是公司员工");
+                                return rb.setMsg("用户名或密码错误");
                             }
                             insertLoginLog(sysUser);
                             return new ResultBean<SysUserVo>().success().setData(sysUserVo);
@@ -166,7 +166,7 @@ public class AppSysUserRest implements AppSysUserFeign {
                             sysUserService.updateAppId(sysUser.getSid(), appId);
                             SysUserVo sysUserVo = sysUserService.selectUser(sysUser);
                             if (sysUserVo == null) {
-                                return rb.setMsg("该用户不是公司员工");
+                                return rb.setMsg("用户名或密码错误");
                             }
                             redisUtil.remove("loginCode" + userName);
                             insertLoginLog(sysUser);
@@ -186,7 +186,7 @@ public class AppSysUserRest implements AppSysUserFeign {
                         if (md5.equals(sysUser.getPassword())) {
                             SysUserVo sysUserVo = sysUserService.selectUser(sysUser);
                             if (sysUserVo == null) {
-                                return rb.setMsg("该用户不是公司员工");
+                                return rb.setMsg("用户名或密码错误");
                             }
                             insertLoginLog(sysUser);
                             return new ResultBean<SysUserVo>().success().setData(sysUserVo);

anrui-scm/anrui-scm-ui/src/api/guache/guachetaizhang.js

@@ -49,7 +49,7 @@ export default {
   // 主车车架号
   selExistingCar: function(data) {
     return request({
-      url: '/base/v1/basevehicle/selVehByStockState',
+      url: '/base/v1/basevehicle/selGCVehByStockState',
       method: 'post',
       params: data
     })