From a5666e91fa12e423a2ef41b03895fbba3023cd08 Mon Sep 17 00:00:00 2001 From: 19173159168 Date: Fri, 12 Sep 2025 00:41:45 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=90=E8=90=A5=E5=95=86=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E3=80=82=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ZcBaseUserServiceImpl.java | 6 +- .../controller/CompanyController.java | 23 ++++ .../controller/system/SysUserController.java | 5 - .../mapper/operation/CompanyStoreMapper.xml | 2 +- .../templates/baseUser/walletChange/edit.html | 2 +- .../baseUser/walletChange/walletChange.html | 2 +- .../templates/operation/car/add.html | 8 +- .../templates/operation/car/car.html | 12 +- .../templates/operation/car/edit.html | 8 +- .../operation/carBrand/carBrand.html | 6 +- .../operation/carModel/carModel.html | 12 +- .../templates/operation/company/add.html | 10 +- .../operation/company/addCompanyUser.html | 129 ++++++++++++++++++ .../templates/operation/company/company.html | 17 ++- .../templates/operation/company/edit.html | 8 +- .../rentCarBattey/rentCarBattey.html | 18 +-- .../operation/rentCarRule/rentCarRule.html | 6 +- .../templates/operation/store/add.html | 12 -- .../operation/store/addStoreUser.html | 12 +- .../templates/operation/store/edit.html | 12 -- .../templates/operation/store/store.html | 16 +-- .../resources/templates/system/user/user.html | 6 + .../java/com/ruoyi/system/domain/Zoning.java | 5 +- .../resources/mapper/system/SysUserMapper.xml | 3 + 24 files changed, 238 insertions(+), 102 deletions(-) create mode 100644 ruoyi-admin/src/main/resources/templates/operation/company/addCompanyUser.html diff --git a/ruoyi-admin/src/main/java/com/ruoyi/baseUser/service/impl/ZcBaseUserServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/baseUser/service/impl/ZcBaseUserServiceImpl.java index f62b84e..ff5498f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/baseUser/service/impl/ZcBaseUserServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/baseUser/service/impl/ZcBaseUserServiceImpl.java @@ -88,8 +88,10 @@ public class ZcBaseUserServiceImpl implements IZcBaseUserService } return rows; }else{ - String md5Hexpwd = DigestUtils.md5Hex(zcBaseUser.getPassword()); - zcBaseUser.setPassword(md5Hexpwd); + 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); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/operation/controller/CompanyController.java b/ruoyi-admin/src/main/java/com/ruoyi/operation/controller/CompanyController.java index 84e54dd..f3fa390 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/operation/controller/CompanyController.java +++ b/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 userList = sysUserService.selectUserList(query); + mmap.put("userList", userList); + return prefix + "/addCompanyUser"; + } + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java index 32e2d90..314f98b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java +++ b/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)); } diff --git a/ruoyi-admin/src/main/resources/mapper/operation/CompanyStoreMapper.xml b/ruoyi-admin/src/main/resources/mapper/operation/CompanyStoreMapper.xml index 7f225be..0fb18bc 100644 --- a/ruoyi-admin/src/main/resources/mapper/operation/CompanyStoreMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/operation/CompanyStoreMapper.xml @@ -187,7 +187,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{name}, #{contactPerson}, #{phone}, - #{contactPerson2}, + #{contactPerson2}, #{phone2}, #{provinceId}, #{provinceName}, diff --git a/ruoyi-admin/src/main/resources/templates/baseUser/walletChange/edit.html b/ruoyi-admin/src/main/resources/templates/baseUser/walletChange/edit.html index 08cf9c3..4951700 100644 --- a/ruoyi-admin/src/main/resources/templates/baseUser/walletChange/edit.html +++ b/ruoyi-admin/src/main/resources/templates/baseUser/walletChange/edit.html @@ -23,7 +23,7 @@
- +
diff --git a/ruoyi-admin/src/main/resources/templates/baseUser/walletChange/walletChange.html b/ruoyi-admin/src/main/resources/templates/baseUser/walletChange/walletChange.html index fe78a4f..072fb59 100644 --- a/ruoyi-admin/src/main/resources/templates/baseUser/walletChange/walletChange.html +++ b/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; } diff --git a/ruoyi-admin/src/main/resources/templates/operation/car/add.html b/ruoyi-admin/src/main/resources/templates/operation/car/add.html index c541f20..051d5fb 100644 --- a/ruoyi-admin/src/main/resources/templates/operation/car/add.html +++ b/ruoyi-admin/src/main/resources/templates/operation/car/add.html @@ -8,15 +8,15 @@
- +
- +
- +
- +
diff --git a/ruoyi-admin/src/main/resources/templates/operation/car/car.html b/ruoyi-admin/src/main/resources/templates/operation/car/car.html index ed3414e..e1d9d47 100644 --- a/ruoyi-admin/src/main/resources/templates/operation/car/car.html +++ b/ruoyi-admin/src/main/resources/templates/operation/car/car.html @@ -64,12 +64,12 @@ 添加 - - 修改 - - - 删除 - + + + + + + 导入 diff --git a/ruoyi-admin/src/main/resources/templates/operation/car/edit.html b/ruoyi-admin/src/main/resources/templates/operation/car/edit.html index 2f29b5b..2c4450b 100644 --- a/ruoyi-admin/src/main/resources/templates/operation/car/edit.html +++ b/ruoyi-admin/src/main/resources/templates/operation/car/edit.html @@ -9,15 +9,15 @@
- +
- +
- +
- +
diff --git a/ruoyi-admin/src/main/resources/templates/operation/carBrand/carBrand.html b/ruoyi-admin/src/main/resources/templates/operation/carBrand/carBrand.html index 541438a..2de56ce 100644 --- a/ruoyi-admin/src/main/resources/templates/operation/carBrand/carBrand.html +++ b/ruoyi-admin/src/main/resources/templates/operation/carBrand/carBrand.html @@ -28,9 +28,9 @@ 添加 - - 修改 - + + +
diff --git a/ruoyi-admin/src/main/resources/templates/operation/carModel/carModel.html b/ruoyi-admin/src/main/resources/templates/operation/carModel/carModel.html index b2a37b5..ecf96c9 100644 --- a/ruoyi-admin/src/main/resources/templates/operation/carModel/carModel.html +++ b/ruoyi-admin/src/main/resources/templates/operation/carModel/carModel.html @@ -42,12 +42,12 @@ 添加 - - 修改 - - - 删除 - + + + + + +
diff --git a/ruoyi-admin/src/main/resources/templates/operation/company/add.html b/ruoyi-admin/src/main/resources/templates/operation/company/add.html index 4824ecb..0d8ea31 100644 --- a/ruoyi-admin/src/main/resources/templates/operation/company/add.html +++ b/ruoyi-admin/src/main/resources/templates/operation/company/add.html @@ -30,7 +30,7 @@
-
@@ -66,13 +66,13 @@
- +
- +
@@ -80,13 +80,13 @@
- +
- +
diff --git a/ruoyi-admin/src/main/resources/templates/operation/company/addCompanyUser.html b/ruoyi-admin/src/main/resources/templates/operation/company/addCompanyUser.html new file mode 100644 index 0000000..8170cdf --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/operation/company/addCompanyUser.html @@ -0,0 +1,129 @@ + + + + + + +
+ + +
+ +
+ +
+
+
+ +
+ +
+
+ +
+ +
+
+ + +
+
+
+
+ +
+
+ + +
+
+
+ +
+

运营商用户

+
+
+
+
+
+
+
+ +
+ + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/operation/company/company.html b/ruoyi-admin/src/main/resources/templates/operation/company/company.html index 1e210e0..5a0a08e 100644 --- a/ruoyi-admin/src/main/resources/templates/operation/company/company.html +++ b/ruoyi-admin/src/main/resources/templates/operation/company/company.html @@ -42,12 +42,12 @@ 添加 - - 修改 - - - 删除 - + + + + + + @@ -133,6 +133,7 @@ align: 'center', formatter: function(value, row, index) { var actions = []; + actions.push('运营商用户 '); actions.push('修改 '); if (row.status == 1) { actions.push('启用 '); @@ -159,6 +160,10 @@ $.operate.post(prefix + "/changeStatus", { "id": id, "phone": phone , "status": 0 }); }) } + + function addCompanyUser(id){ + $.modal.open("添加运营商用户", prefix + "/addCompanyUser/" + id, '1200', '800'); + } diff --git a/ruoyi-admin/src/main/resources/templates/operation/company/edit.html b/ruoyi-admin/src/main/resources/templates/operation/company/edit.html index 0dd38f7..6bceb17 100644 --- a/ruoyi-admin/src/main/resources/templates/operation/company/edit.html +++ b/ruoyi-admin/src/main/resources/templates/operation/company/edit.html @@ -65,25 +65,25 @@
- +
- +
- +
- +
diff --git a/ruoyi-admin/src/main/resources/templates/operation/rentCarBattey/rentCarBattey.html b/ruoyi-admin/src/main/resources/templates/operation/rentCarBattey/rentCarBattey.html index 72c5642..2bca01e 100644 --- a/ruoyi-admin/src/main/resources/templates/operation/rentCarBattey/rentCarBattey.html +++ b/ruoyi-admin/src/main/resources/templates/operation/rentCarBattey/rentCarBattey.html @@ -35,15 +35,15 @@ 添加 - - 修改 - - - 删除 - - - 导出 - + + + + + + + + +
diff --git a/ruoyi-admin/src/main/resources/templates/operation/rentCarRule/rentCarRule.html b/ruoyi-admin/src/main/resources/templates/operation/rentCarRule/rentCarRule.html index fc8f70d..1271616 100644 --- a/ruoyi-admin/src/main/resources/templates/operation/rentCarRule/rentCarRule.html +++ b/ruoyi-admin/src/main/resources/templates/operation/rentCarRule/rentCarRule.html @@ -69,9 +69,9 @@ 添加 - - 删除 - + + + diff --git a/ruoyi-admin/src/main/resources/templates/operation/store/add.html b/ruoyi-admin/src/main/resources/templates/operation/store/add.html index 1a28a7f..c5cf053 100644 --- a/ruoyi-admin/src/main/resources/templates/operation/store/add.html +++ b/ruoyi-admin/src/main/resources/templates/operation/store/add.html @@ -33,18 +33,6 @@
-
- -
- -
-
-
- -
- -
-
diff --git a/ruoyi-admin/src/main/resources/templates/operation/store/addStoreUser.html b/ruoyi-admin/src/main/resources/templates/operation/store/addStoreUser.html index 58d138c..2e7667f 100644 --- a/ruoyi-admin/src/main/resources/templates/operation/store/addStoreUser.html +++ b/ruoyi-admin/src/main/resources/templates/operation/store/addStoreUser.html @@ -14,12 +14,12 @@
-
- -
- -
-
+ + + + + +
diff --git a/ruoyi-admin/src/main/resources/templates/operation/store/edit.html b/ruoyi-admin/src/main/resources/templates/operation/store/edit.html index b6c095b..cc1577c 100644 --- a/ruoyi-admin/src/main/resources/templates/operation/store/edit.html +++ b/ruoyi-admin/src/main/resources/templates/operation/store/edit.html @@ -34,18 +34,6 @@
-
- -
- -
-
-
- -
- -
-
diff --git a/ruoyi-admin/src/main/resources/templates/operation/store/store.html b/ruoyi-admin/src/main/resources/templates/operation/store/store.html index 668a963..920d534 100644 --- a/ruoyi-admin/src/main/resources/templates/operation/store/store.html +++ b/ruoyi-admin/src/main/resources/templates/operation/store/store.html @@ -70,12 +70,12 @@ 添加 - - 修改 - - - 删除 - + + + + + + @@ -191,7 +191,7 @@ align: 'center', formatter: function(value, row, index) { var actions = []; - actions.push('门店用户 '); + actions.push('门店用户 '); actions.push('修改 '); actions.push('删除'); if (row.status == 1) { @@ -220,7 +220,7 @@ }) } - function assStoreUser(id){ + function addStoreUser(id){ $.modal.open("添加门店用户", prefix + "/addStoreUser/" + id); } diff --git a/ruoyi-admin/src/main/resources/templates/system/user/user.html b/ruoyi-admin/src/main/resources/templates/system/user/user.html index 0fd896b..4d48a91 100644 --- a/ruoyi-admin/src/main/resources/templates/system/user/user.html +++ b/ruoyi-admin/src/main/resources/templates/system/user/user.html @@ -23,6 +23,12 @@
  • 手机号码：
    • +
  • + 用户类型： +
  • 用户状态：