瀏覽代碼

解决查询车队问题、解决创建司机车队 用户无效问题

阿伏兔 4 年之前
父節點
當前提交
b26ff91d09

+ 2 - 1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/fleet/basicData/FleetDriverMsgController.java

@@ -63,7 +63,8 @@ public class FleetDriverMsgController extends BaseController
     @GetMapping(value = "/query")
     public TableDataInfo query(TCorps tCorps)
     {
-        tCorps.setfTypeid("102");
+        String typeValue = "[\"102\"]";
+        tCorps.setfTypeid(typeValue);
         startPage();
         List<Map<String, Object>> list = tCorpsService.selectFleetDriverMsgListMap(tCorps);
         return getDataTable(list);

+ 0 - 1
ruoyi-fleet/src/main/java/com/ruoyi/basicData/service/impl/FleetCompanyMsgServiceImpl.java

@@ -140,7 +140,6 @@ public class FleetCompanyMsgServiceImpl implements IFleetCompanyMsgService {
     public AjaxResult createUser(TCorps tCorps) {
         // 创建用户
         SysUser user = new SysUser();
-        user.setStatus("1");
         user.setUserType("00");
         user.setUserSystem("2");
         user.setCreateTime(new Date());

+ 1 - 2
ruoyi-fleet/src/main/java/com/ruoyi/basicData/service/impl/FleetDriverMsgServiceImpl.java

@@ -129,7 +129,7 @@ public class FleetDriverMsgServiceImpl implements IFleetDriverMsgService {
                 user.setUserSystem("2");
                 user.setNickName(tCorps.getfName());
                 user.setUpdateTime(new Date());
-                user.setStatus("1");
+                user.setStatus("0");
                 user.setUpdateBy(SecurityUtils.getUsername());
                 user.setPassword(SecurityUtils.encryptPassword(tCorps.getfTel()));
                 userMapper.updateUser(user);
@@ -138,7 +138,6 @@ public class FleetDriverMsgServiceImpl implements IFleetDriverMsgService {
                 // 添加用户表
                 SysUser use = new SysUser();
                 use.setUserSystem("2");
-                use.setStatus("1");
                 use.setUserName(tCorps.getfTel());
                 use.setNickName(tCorps.getfTel());
                 use.setPhonenumber(tCorps.getfTel());

+ 1 - 1
ruoyi-warehouse/src/main/resources/mapper/basicData/TCorpsMapper.xml

@@ -71,7 +71,7 @@
         <include refid="selectTCorpsVo"/>
         <where>
             <if test="fTypeid != null  and fTypeid != ''"> and JSON_CONTAINS( f_typeid -> '$[*]', #{fTypeid}, '$')</if>
-            <if test="fTypeid == null or fTypeid == ''"> and f_typeid != '[\"102\"]'</if>
+            <if test="fTypeid == null or fTypeid == ''"> and f_typeid != '[\"100\"]' and f_typeid != '[\"102\"]'</if>
             <if test="fPid != null  and fPid != ''"> and f_pid = #{fPid}</if>
             <if test="fNo != null  and fNo != ''"> and f_no = #{fNo}</if>
             <if test="fName != null  and fName != ''"> and f_name like concat('%', #{fName}, '%')</if>