运营商增加用户。问题修复

ruoyi-admin/src/main/java/com/ruoyi/baseUser/service/impl/ZcBaseUserServiceImpl.java

@@ -88,8 +88,10 @@ public class ZcBaseUserServiceImpl implements IZcBaseUserService
             }
             return rows;
         }else{
+            if(StringUtils.isNotEmpty(zcBaseUser.getPassword())) {
                 String md5Hexpwd = DigestUtils.md5Hex(zcBaseUser.getPassword());
                 zcBaseUser.setPassword(md5Hexpwd);
+            }
             zcBaseUser.setIsStore(1L);
             zcBaseUser.setCreateTime(DateUtils.getNowDate());
             int rows = zcBaseUserMapper.insertZcBaseUser(zcBaseUser);

ruoyi-admin/src/main/java/com/ruoyi/operation/controller/CompanyController.java

@@ -3,12 +3,15 @@ package com.ruoyi.operation.controller;
 import java.util.List;
 
 import com.ruoyi.api.DataPushApi;
+import com.ruoyi.baseUser.domain.ZcBaseUser;
+import com.ruoyi.baseUser.service.IZcBaseUserService;
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.exception.RRException;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.framework.shiro.service.SysPasswordService;
+import com.ruoyi.operation.domain.CompanyStore;
 import com.ruoyi.system.domain.Zoning;
 import com.ruoyi.system.service.ISysAreaHnService;
 import com.ruoyi.system.service.ISysUserService;
@@ -54,6 +57,9 @@ public class CompanyController extends BaseController
     @Autowired
     private ISysAreaHnService areaHnService;
 
+    @Autowired
+    private ISysUserService sysUserService;
+
     @Autowired
     private DataPushApi dataPushApi;
 
@@ -191,4 +197,21 @@ public class CompanyController extends BaseController
     {
         return toAjax(companyService.changeStatus(company));
     }
+
+
+    @RequiresPermissions("operation:company:edit")
+    @GetMapping("/addCompanyUser/{id}")
+    public String addCompanyUser(@PathVariable("id") Long id, ModelMap mmap)
+    {
+
+        Company company = companyService.selectCompanyById(id);
+        mmap.put("company", company);
+
+        SysUser query = new SysUser();
+        query.setGroupId(id);
+        List<SysUser> userList = sysUserService.selectUserList(query);
+        mmap.put("userList", userList);
+        return prefix + "/addCompanyUser";
+    }
+
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -168,8 +168,6 @@ public class SysUserController extends BaseController
         user.setTownName(zoning.getTownName());
         user.setVillageCode(zoning.getVillageCode());
         user.setVillageName(zoning.getVillageName());
-        user.setGroupId(zoning.getGroupId());
-        user.setGroupName(zoning.getGroupName());
         user.setStatus("0");
         return toAjax(userService.insertUser(user));
     }
@@ -223,9 +221,6 @@ public class SysUserController extends BaseController
         user.setTownName(zoning.getTownName());
         user.setVillageCode(zoning.getVillageCode());
         user.setVillageName(zoning.getVillageName());
-        user.setGroupId(zoning.getGroupId());
-        user.setGroupName(zoning.getGroupName());
-
         AuthorizationUtils.clearAllCachedAuthorizationInfo();
         return toAjax(userService.updateUser(user));
     }

ruoyi-admin/src/main/resources/mapper/operation/CompanyStoreMapper.xml

@@ -187,7 +187,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="name != null and name != ''">#{name},</if>
             <if test="contactPerson != null and contactPerson != ''">#{contactPerson},</if>
             <if test="phone != null and phone != ''">#{phone},</if>
-            <if test="contactPerson != null and contactPerson2 != ''">#{contactPerson2},</if>
+            <if test="contactPerson2 != null and contactPerson2 != ''">#{contactPerson2},</if>
             <if test="phone2 != null and phone2 != ''">#{phone2},</if>
             <if test="provinceId != null">#{provinceId},</if>
             <if test="provinceName != null">#{provinceName},</if>

ruoyi-admin/src/main/resources/templates/baseUser/walletChange/edit.html

@@ -23,7 +23,7 @@
                 </div>
             </div>
             <div class="form-group">
-                <label class="col-sm-3 control-label is-required">密码确认：</label>
+                <label class="col-sm-3 control-label is-required">输入当前用户登录密码：</label>
                 <div class="col-sm-8">
                     <input id="password" name="password"   class="form-control" type="password" required>
                 </div>

ruoyi-admin/src/main/resources/templates/baseUser/walletChange/walletChange.html

@@ -178,7 +178,7 @@
             var password = iframeWin.$('#password').val(); // 获取密码字段的值
 
             if (!password) {
-                layer.msg('请输入登录密码进行验证', {icon: 5});
+                layer.msg('请输入当前用户登录密码进行验证', {icon: 5});
                 return;
             }
 

ruoyi-admin/src/main/resources/templates/operation/car/add.html

@@ -8,15 +8,15 @@
     <div class="wrapper wrapper-content animated fadeInRight ibox-content">
         <form class="form-horizontal m" id="form-car-add">
             <div class="form-group">    
-                <label class="col-sm-3 control-label">车架号(VIN)：</label>
+                <label class="col-sm-3 control-label is-required">车架号(VIN)：</label>
                 <div class="col-sm-8">
-                    <input name="vin" class="form-control" type="text">
+                    <input name="vin" class="form-control" type="text" required>
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">车牌号码：</label>
+                <label class="col-sm-3 control-label is-required">车牌号码：</label>
                 <div class="col-sm-8">
-                    <input name="licensePlate" class="form-control" type="text">
+                    <input name="licensePlate" class="form-control" type="text" required>
                 </div>
             </div>
             <div class="form-group">

ruoyi-admin/src/main/resources/templates/operation/car/car.html

@@ -64,12 +64,12 @@
                 <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="operation:car:add">
                     <i class="fa fa-plus"></i> 添加
                 </a>
-                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="operation:car:edit">
+<!--                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="operation:car:edit">-->
-                    <i class="fa fa-edit"></i> 修改
+<!--                    <i class="fa fa-edit"></i> 修改-->
-                </a>
+<!--                </a>-->
-                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="operation:car:remove">
+<!--                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="operation:car:remove">-->
-                    <i class="fa fa-remove"></i> 删除
+<!--                    <i class="fa fa-remove"></i> 删除-->
-                </a>
+<!--                </a>-->
                 <a class="btn btn-info" onclick="$.table.importExcel()" shiro:hasPermission="operation:car:import">
                     <i class="fa fa-upload"></i> 导入
                 </a>

ruoyi-admin/src/main/resources/templates/operation/car/edit.html

@@ -9,15 +9,15 @@
         <form class="form-horizontal m" id="form-car-edit" th:object="${zcCar}">
             <input name="id" th:field="*{id}" type="hidden">
             <div class="form-group">    
-                <label class="col-sm-3 control-label">车架号(VIN)：</label>
+                <label class="col-sm-3 control-label is-required">车架号(VIN)：</label>
                 <div class="col-sm-8">
-                    <input name="vin" th:field="*{vin}" class="form-control" type="text">
+                    <input name="vin" th:field="*{vin}" class="form-control" type="text" required>
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">车牌号码：</label>
+                <label class="col-sm-3 control-label is-required">车牌号码：</label>
                 <div class="col-sm-8">
-                    <input name="licensePlate" th:field="*{licensePlate}" class="form-control" type="text">
+                    <input name="licensePlate" th:field="*{licensePlate}" class="form-control" type="text" required>
                 </div>
             </div>
             <div class="form-group">

ruoyi-admin/src/main/resources/templates/operation/carBrand/carBrand.html

@@ -28,9 +28,9 @@
                 <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="operation:carBrand:add">
                     <i class="fa fa-plus"></i> 添加
                 </a>
-                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="operation:carBrand:edit">
+<!--                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="operation:carBrand:edit">-->
-                    <i class="fa fa-edit"></i> 修改
+<!--                    <i class="fa fa-edit"></i> 修改-->
-                </a>
+<!--                </a>-->
             </div>
             <div class="col-sm-12 select-table table-striped">
                 <table id="bootstrap-table"></table>

ruoyi-admin/src/main/resources/templates/operation/carModel/carModel.html

@@ -42,12 +42,12 @@
                 <a class="btn btn-success" onclick="$.operate.addCustomize(null,1300,700)" shiro:hasPermission="operation:carModel:add">
                     <i class="fa fa-plus"></i> 添加
                 </a>
-                <a class="btn btn-primary single disabled" onclick="$.operate.editCustomize(null,1300,700)" shiro:hasPermission="operation:carModel:edit">
+<!--                <a class="btn btn-primary single disabled" onclick="$.operate.editCustomize(null,1300,700)" shiro:hasPermission="operation:carModel:edit">-->
-                    <i class="fa fa-edit"></i> 修改
+<!--                    <i class="fa fa-edit"></i> 修改-->
-                </a>
+<!--                </a>-->
-                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="operation:carModel:remove">
+<!--                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="operation:carModel:remove">-->
-                    <i class="fa fa-remove"></i> 删除
+<!--                    <i class="fa fa-remove"></i> 删除-->
-                </a>
+<!--                </a>-->
             </div>
             <div class="col-sm-12 select-table table-striped">
                 <table id="bootstrap-table"></table>

ruoyi-admin/src/main/resources/templates/operation/company/add.html

@@ -30,7 +30,7 @@
             <div class="form-group">
                 <label class="col-sm-3 control-label is-required">是否可新增套餐：</label>
                 <div class="col-sm-8">
-                    <select name="isAddRules" class="form-control m-b" th:with="type=${@dict.getType('key_is_add_rules')}" required >
+                    <select name="isAddRules" class="form-control m-b" th:with="type=${@dict.getType('key_is_add_rules')}" required>
                         <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                     </select>
                 </div>
@@ -66,13 +66,13 @@
             <div class="form-group">    
                 <label class="col-sm-3 control-label is-required">微信收款商户号：</label>
                 <div class="col-sm-8">
-                    <input name="wechatReceivingAccount" class="form-control" type="text"  maxlength="500" required>
+                    <textarea name="wechatReceivingAccount" maxlength="500" class="form-control" rows="3" required></textarea>
                 </div>
             </div>
             <div class="form-group">    
                 <label class="col-sm-3 control-label is-required">微信收款密钥：</label>
                 <div class="col-sm-8">
-                    <input name="wechatKey" class="form-control" type="text" maxlength="500" required>
+                    <textarea name="wechatKey" maxlength="500" class="form-control" rows="3" required></textarea>
                 </div>
             </div>
         
@@ -80,13 +80,13 @@
             <div class="form-group">    
                 <label class="col-sm-3 control-label is-required">支付宝收款商户号：</label>
                 <div class="col-sm-8">
-                    <input name="aliReceivingAccount" class="form-control" type="text" maxlength="500" required>
+                    <textarea name="aliReceivingAccount" maxlength="500" class="form-control" rows="3" required></textarea>
                 </div>
             </div>
             <div class="form-group">    
                 <label class="col-sm-3 control-label is-required">支付宝收款密钥：</label>
                 <div class="col-sm-8">
-                    <input name="aliKey" class="form-control" type="text" maxlength="500" required>
+                    <textarea name="aliKey" maxlength="500" class="form-control" rows="3" required></textarea>
                 </div>
             </div>
          

ruoyi-admin/src/main/resources/templates/operation/company/addCompanyUser.html

@@ -0,0 +1,129 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('新增运营商用户信息')" />
+</head>
+<body class="white-bg">
+<div class="wrapper wrapper-content animated fadeInRight ibox-content">
+    <form class="form-horizontal m" id="form-user-add">
+        <input class='form-control' type='hidden' name='groupId' th:value="${company.id}" >
+        <div class="form-group">
+            <label class="col-sm-3 control-label is-required">用户名：</label>
+            <div class="col-sm-8">
+                <input name="userName" class="form-control" type="text" required>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label is-required">登录账号：</label>
+            <div class="col-sm-8">
+                <input id="loginName" name="loginName" class="form-control" type="text" maxlength="30" required>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label class="col-sm-3 control-label is-required">登录密码：</label>
+            <div class="col-sm-8">
+                <div class="input-group">
+                    <input id="password" name="password" class="form-control" type="password" th:value="${@config.getKey('sys.user.initPassword')}" required>
+                    <span class="input-group-addon" title="登录密码,鼠标按下显示密码"
+                          onmousedown="$('#password').attr('type','text')"
+                          onmouseup="$('#password').attr('type','password')"><i class="fa fa-key"></i></span>
+                </div>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label is-required">手机号码：</label>
+            <div class="col-sm-8">
+                <div class="input-group">
+                    <input id="phonenumber" name="phonenumber" class="form-control" type="text" maxlength="11" required>
+                    <span class="input-group-addon"><i class="fa fa-mobile"></i></span>
+                </div>
+            </div>
+        </div>
+        <input type="hidden" name = "userType" value="02">
+        <br/>
+        <h4 class="form-header h4">运营商用户</h4>
+        <div class="row">
+            <div class="col-sm-12">
+                <div class="col-sm-12 select-table table-striped">
+                    <table id="bootstrap-table"></table>
+                </div>
+            </div>
+        </div>
+    </form>
+</div>
+<th:block th:include="include :: footer" />
+<script th:inline="javascript">
+    var prefix = ctx + "system/user";
+    $("#form-user-add").validate({
+        focusCleanup: true
+    });
+
+    function submitHandler() {
+        if ($.validate.form()) {
+            var data = $("#form-user-add").serializeArray();
+            var roleIds = [100];
+            data.push({"name": "roleIds", "value": roleIds});
+            $.operate.save(prefix + "/add", data);
+        }
+    }
+
+    var removeFlag = [[${@permission.hasPermi('baseUser:user:remove')}]];
+    var userTypeDatas = [[${@dict.getType('sys_user_type')}]];
+    $(function() {
+        var options = {
+            data: [[${userList}]],
+            pagination: false,
+            showSearch: false,
+            showRefresh: false,
+            showToggle: false,
+            showColumns: false,
+            sidePagination: "client",
+            removeUrl: prefix + "/remove",
+            modalName: "运营商用户",
+            columns: [{
+                checkbox: false
+            },
+                {
+                    field: 'loginName',
+                    title: '登录名称',
+                    sortable: true
+                },
+                {
+                    field: 'userName',
+                    title: '用户名称'
+                },
+
+                {
+                    field: 'phonenumber',
+                    title: '手机'
+                },
+                {
+                    field: 'userType',
+                    title: '用户类型',
+                    formatter: function(value, row, index) {
+                        return $.table.selectDictLabel(userTypeDatas, value);
+                    }
+                },
+
+                {
+                    field: 'createTime',
+                    title: '创建时间',
+                    sortable: true
+                },
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + ' btnOption" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.userId + '\')"><i class="fa fa-remove"></i>删除</a>');
+                        return actions.join('');
+                    }
+                }]
+        };
+        $.table.init(options);
+    });
+
+</script>
+</body>
+</html>

ruoyi-admin/src/main/resources/templates/operation/company/company.html

@@ -42,12 +42,12 @@
                 <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="operation:company:add">
                     <i class="fa fa-plus"></i> 添加
                 </a>
-                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="operation:company:edit">
+<!--                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="operation:company:edit">-->
-                    <i class="fa fa-edit"></i> 修改
+<!--                    <i class="fa fa-edit"></i> 修改-->
-                </a>
+<!--                </a>-->
-                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="operation:company:remove">
+<!--                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="operation:company:remove">-->
-                    <i class="fa fa-remove"></i> 删除
+<!--                    <i class="fa fa-remove"></i> 删除-->
-                </a>
+<!--                </a>-->
 <!--                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="operation:company:export">-->
 <!--                    <i class="fa fa-download"></i> 导出-->
 <!--                </a>-->
@@ -133,6 +133,7 @@
                     align: 'center',
                     formatter: function(value, row, index) {
                         var actions = [];
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + ' btnOption" href="javascript:void(0)" onclick="addCompanyUser(\'' + row.id + '\')"><i class="fa fa-edit"></i>运营商用户</a> ');
                         actions.push('<a class="btn btn-success btn-xs ' + editFlag + ' btnOption" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>修改</a> ');
                         if (row.status == 1) {
                             actions.push('<a class="btn btn-success btn-xs ' + removeFlag + ' btnOption" href="javascript:void(0)" onclick="enable(\'' + row.id + '\',\'' + row.phone + '\')"><i class="fa fa-edit"></i>启用</a> ');
@@ -159,6 +160,10 @@
                 $.operate.post(prefix + "/changeStatus", { "id": id, "phone": phone , "status": 0 });
             })
         }
+
+        function addCompanyUser(id){
+            $.modal.open("添加运营商用户", prefix + "/addCompanyUser/" + id, '1200', '800');
+        }
     </script>
 </body>
 </html>

ruoyi-admin/src/main/resources/templates/operation/company/edit.html

@@ -65,25 +65,25 @@
             <div class="form-group">    
                 <label class="col-sm-3 control-label is-required">微信收款商户号：</label>
                 <div class="col-sm-8">
-                    <input name="wechatReceivingAccount" th:field="*{wechatReceivingAccount}" class="form-control" type="text" maxlength="500" required>
+                    <textarea name="wechatReceivingAccount" maxlength="500" class="form-control" rows="3" required>[[*{wechatReceivingAccount}]]</textarea>
                 </div>
             </div>
             <div class="form-group">    
                 <label class="col-sm-3 control-label is-required">微信收款密钥：</label>
                 <div class="col-sm-8">
-                    <input name="wechatKey" th:field="*{wechatKey}" class="form-control" type="text" maxlength="500" required>
+                    <textarea name="wechatKey" maxlength="500" class="form-control" rows="3" required>[[*{wechatKey}]]</textarea>
                 </div>
             </div>
             <div class="form-group">    
                 <label class="col-sm-3 control-label is-required">支付宝收款商户号：</label>
                 <div class="col-sm-8">
-                    <input name="aliReceivingAccount" th:field="*{aliReceivingAccount}" class="form-control" type="text" maxlength="500" required>
+                    <textarea name="aliReceivingAccount" maxlength="500" class="form-control" rows="3" required>[[*{aliReceivingAccount}]]</textarea>
                 </div>
             </div>
             <div class="form-group">    
                 <label class="col-sm-3 control-label is-required">支付宝收款密钥：</label>
                 <div class="col-sm-8">
-                    <input name="aliKey" th:field="*{aliKey}" class="form-control" type="text" maxlength="500" required>
+                    <textarea name="aliKey" maxlength="500" class="form-control" rows="3" required>[[*{aliKey}]]</textarea>
                 </div>
             </div>
            

ruoyi-admin/src/main/resources/templates/operation/rentCarBattey/rentCarBattey.html

@@ -35,15 +35,15 @@
                 <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="operation:rentCarBattey:add">
                     <i class="fa fa-plus"></i> 添加
                 </a>
-                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="operation:rentCarBattey:edit">
+<!--                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="operation:rentCarBattey:edit">-->
-                    <i class="fa fa-edit"></i> 修改
+<!--                    <i class="fa fa-edit"></i> 修改-->
-                </a>
+<!--                </a>-->
-                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="operation:rentCarBattey:remove">
+<!--                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="operation:rentCarBattey:remove">-->
-                    <i class="fa fa-remove"></i> 删除
+<!--                    <i class="fa fa-remove"></i> 删除-->
-                </a>
+<!--                </a>-->
-                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="operation:rentCarBattey:export">
+<!--                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="operation:rentCarBattey:export">-->
-                    <i class="fa fa-download"></i> 导出
+<!--                    <i class="fa fa-download"></i> 导出-->
-                </a>
+<!--                </a>-->
             </div>
             <div class="col-sm-12 select-table table-striped">
                 <table id="bootstrap-table"></table>

ruoyi-admin/src/main/resources/templates/operation/rentCarRule/rentCarRule.html

@@ -69,9 +69,9 @@
                 <a class="btn btn-success" onclick="$.operate.addCustomize(null,900,700)" shiro:hasPermission="operation:rentCarRule:add">
                     <i class="fa fa-plus"></i> 添加
                 </a>
-                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="operation:rentCarRule:remove">
+<!--                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="operation:rentCarRule:remove">-->
-                    <i class="fa fa-remove"></i> 删除
+<!--                    <i class="fa fa-remove"></i> 删除-->
-                </a>
+<!--                </a>-->
 <!--                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="operation:rentCarRule:export">-->
 <!--                    <i class="fa fa-download"></i> 导出-->
 <!--                </a>-->

ruoyi-admin/src/main/resources/templates/operation/store/add.html

@@ -33,18 +33,6 @@
                     <input name="phone" class="form-control" type="text" required>
                 </div>
             </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label ">联系人2：</label>
-                <div class="col-sm-8">
-                    <input name="contactPerson2" class="form-control" type="text" >
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label ">联系电话2：</label>
-                <div class="col-sm-8">
-                    <input name="phone2" class="form-control" type="text" >
-                </div>
-            </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label is-required">所属运营商：</label>
                 <div class="col-sm-8">

ruoyi-admin/src/main/resources/templates/operation/store/addStoreUser.html

@@ -14,12 +14,12 @@
                 <input name="userName" class="form-control" type="text" required>
             </div>
         </div>
-        <div class="form-group">
+<!--        <div class="form-group">-->
-            <label class="col-sm-3 control-label is-required">密码：</label>
+<!--            <label class="col-sm-3 control-label is-required">密码：</label>-->
-            <div class="col-sm-8">
+<!--            <div class="col-sm-8">-->
-                <input name="password" class="form-control" type="text" required>
+<!--                <input name="password" class="form-control" type="text" required>-->
-            </div>
+<!--            </div>-->
-        </div>
+<!--        </div>-->
         <div class="form-group">
             <label class="col-sm-3 control-label is-required">手机号：</label>
             <div class="col-sm-8">

ruoyi-admin/src/main/resources/templates/operation/store/edit.html

@@ -34,18 +34,6 @@
                 <input name="phone" th:field="*{phone}" class="form-control" type="text" required>
             </div>
         </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label ">联系人2：</label>
-            <div class="col-sm-8">
-                <input name="contactPerson2" th:field="*{contactPerson2}" class="form-control" type="text" >
-            </div>
-        </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label ">联系电话2：</label>
-            <div class="col-sm-8">
-                <input name="phone2" th:field="*{phone2}" class="form-control" type="text" >
-            </div>
-        </div>
         <div class="form-group">
             <label class="col-sm-3 control-label is-required">所属运营商：</label>
             <div class="col-sm-8">

ruoyi-admin/src/main/resources/templates/operation/store/store.html

@@ -70,12 +70,12 @@
                 <a class="btn btn-success" onclick="$.operate.addCustomize(null,1300,700)" shiro:hasPermission="operation:store:add">
                     <i class="fa fa-plus"></i> 添加
                 </a>
-                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="operation:store:edit">
+<!--                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="operation:store:edit">-->
-                    <i class="fa fa-edit"></i> 修改
+<!--                    <i class="fa fa-edit"></i> 修改-->
-                </a>
+<!--                </a>-->
-                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="operation:store:remove">
+<!--                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="operation:store:remove">-->
-                    <i class="fa fa-remove"></i> 删除
+<!--                    <i class="fa fa-remove"></i> 删除-->
-                </a>
+<!--                </a>-->
 <!--                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="operation:store:export">-->
 <!--                    <i class="fa fa-download"></i> 导出-->
 <!--                </a>-->
@@ -191,7 +191,7 @@
                     align: 'center',
                     formatter: function(value, row, index) {
                         var actions = [];
-                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + ' btnOption" href="javascript:void(0)" onclick="assStoreUser(\'' + row.id + '\')"><i class="fa fa-edit"></i>门店用户</a> ');
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + ' btnOption" href="javascript:void(0)" onclick="addStoreUser(\'' + row.id + '\')"><i class="fa fa-edit"></i>门店用户</a> ');
                         actions.push('<a class="btn btn-success btn-xs ' + editFlag + ' btnOption" href="javascript:void(0)" onclick="$.operate.editCustomize(\'' + row.id + '\',1300,700)"><i class="fa fa-edit"></i>修改</a> ');
                         actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + ' btnOption" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
                         if (row.status == 1) {
@@ -220,7 +220,7 @@
             })
         }
 
-        function assStoreUser(id){
+        function addStoreUser(id){
             $.modal.open("添加门店用户", prefix + "/addStoreUser/" + id);
         }
     </script>

ruoyi-admin/src/main/resources/templates/system/user/user.html

@@ -23,6 +23,12 @@
 								<li>
 									手机号码：<input type="text" name="phonenumber"/>
 								</li>
+                                <li>
+                                    用户类型：<select name="userType" th:with="type=${@dict.getType('sys_user_type')}">
+                                    <option value="">所有</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                                </select>
+                                </li>
 								<li>
 									用户状态：<select name="status" th:with="type=${@dict.getType('sys_normal_disable')}">
 										<option value="">所有</option>

ruoyi-system/src/main/java/com/ruoyi/system/domain/Zoning.java

@@ -23,8 +23,5 @@ public class Zoning extends BaseEntity {
     private String villageCode;
     /** 村名称 */
     private String villageName;
-    /** 办案室ID */
+
-    private Long groupId;
-    /** 组名称 */
-    private String groupName;
 }

ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -135,6 +135,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<if test="groupName != null and groupName != ''">
 			AND u.group_name like concat('%', #{groupName}, '%')
 		</if>
+        <if test="userType != null and userType != ''">
+            AND u.user_type = #{userType}
+        </if>
 		<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
 			AND date_format(u.create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
 		</if>