1.添加用户编辑功能

imwork-assist/imwork-generator-service/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>top.imwork</groupId>
         <artifactId>imwork-assist</artifactId>
-        <version>2025.12.1.0</version>
+        <version>2025.12.1.1</version>
     </parent>
 
     <artifactId>imwork-generator-service</artifactId>

imwork-assist/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>top.imwork</groupId>
         <artifactId>imwork-plus</artifactId>
-        <version>2025.12.1.0</version>
+        <version>2025.12.1.1</version>
     </parent>
 
     <artifactId>imwork-assist</artifactId>

imwork-commons/imwork-commons-alibaba/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>top.imwork</groupId>
         <artifactId>imwork-commons</artifactId>
-        <version>2025.12.1.0</version>
+        <version>2025.12.1.1</version>
     </parent>
 
     <artifactId>imwork-commons-alibaba</artifactId>

imwork-commons/imwork-commons-core/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>top.imwork</groupId>
         <artifactId>imwork-commons</artifactId>
-        <version>2025.12.1.0</version>
+        <version>2025.12.1.1</version>
     </parent>
 
     <artifactId>imwork-commons-core</artifactId>

imwork-commons/imwork-commons-dao/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>top.imwork</groupId>
         <artifactId>imwork-commons</artifactId>
-        <version>2025.12.1.0</version>
+        <version>2025.12.1.1</version>
     </parent>
 
     <artifactId>imwork-commons-dao</artifactId>

imwork-commons/imwork-commons-security/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>top.imwork</groupId>
         <artifactId>imwork-commons</artifactId>
-        <version>2025.12.1.0</version>
+        <version>2025.12.1.1</version>
     </parent>
 
     <artifactId>imwork-commons-security</artifactId>

imwork-commons/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>top.imwork</groupId>
         <artifactId>imwork-plus</artifactId>
-        <version>2025.12.1.0</version>
+        <version>2025.12.1.1</version>
     </parent>
 
     <artifactId>imwork-commons</artifactId>

imwork-exercise/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>top.imwork</groupId>
         <artifactId>imwork-plus</artifactId>
-        <version>2025.12.1.0</version>
+        <version>2025.12.1.1</version>
     </parent>
 
     <groupId>top.imwork.exercise</groupId>

imwork-iaas/imwork-gateway-service/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>top.imwork</groupId>
         <artifactId>imwork-iaas</artifactId>
-        <version>2025.12.1.0</version>
+        <version>2025.12.1.1</version>
     </parent>
 
     <artifactId>imwork-gateway-service</artifactId>

imwork-iaas/imwork-uaa-service/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>top.imwork</groupId>
         <artifactId>imwork-plus</artifactId>
-        <version>2025.12.1.0</version>
+        <version>2025.12.1.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

imwork-iaas/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>top.imwork</groupId>
         <artifactId>imwork-plus</artifactId>
-        <version>2025.12.1.0</version>
+        <version>2025.12.1.1</version>
     </parent>
 
     <artifactId>imwork-iaas</artifactId>

imwork-windows/imwork-silos/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>top.imwork</groupId>
         <artifactId>imwork-windows</artifactId>
-        <version>2025.12.1.0</version>
+        <version>2025.12.1.1</version>
     </parent>
 
     <artifactId>imwork-silos</artifactId>

imwork-windows/imwork-silos/src/main/java/top/imwork/window/silos/service/impl/SysUserServiceImpl.java

@@ -56,6 +56,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserDao,SysUser> implemen
             sysUser.setModifier("admin");
             sysUserDao.insert(sysUser);
         } else {
+            sysUser.setUpdateTime(new Date());
             sysUserDao.updateById(sysUser);
         }
         return SysUserConvert.sysUserDoToBo(sysUser);

imwork-windows/imwork-silos/src/main/resources/static/business/upms/user/js/edit.js

@@ -9,13 +9,18 @@ layui.use(['form', 'layer'], function () {
      */
     function collectFormData() {
         return {
+            id: $('#id').val(),
             loginName: $('#loginName').val(),
             userName: $('#userName').val(),
             userAddress: $('#userAddress').val(),
-            userMobilePhone: $('#userMobilePhone').val(),
+            userMobilPhone: $('#userMobilePhone').val(),
+            userNickName: $('#userNickName').val(),
+            userIdCard: $('#userIdCard').val(),
             userDesc: $('#userDesc').val(),
             userEmail: $('#userEmail').val(),
+            dncnet: $('.dncnet').val(),
             userType: $('#userType').val(),
+            isDifferentIpLogin: $('.isDifferentIpLogin').val(),
             userGender: $('input[name="userGender"]:checked').val(),
             userStatus: $('#userStatus').val(),
             orgTreeId: $('#orgTreeId').val(),
@@ -56,7 +61,7 @@ layui.use(['form', 'layer'], function () {
             };
         }
 
-        return { isValid: true, message: '' };
+        return {isValid: true, message: ''};
     }
 
     /**
@@ -167,7 +172,7 @@ layui.use(['form', 'layer'], function () {
         // 验证表单数据
         const validation = validateFormData(formData);
         if (!validation.isValid) {
-            layer.msg(validation.message, { icon: 2 });
+            layer.msg(validation.message, {icon: 2});
             return false;
         }
 
@@ -188,14 +193,14 @@ layui.use(['form', 'layer'], function () {
                         closeAndReloadParent();
                     });
                 } else {
-                    layer.msg(res.msg || '操作失败', { icon: 2 });
+                    layer.msg(res.msg || '操作失败', {icon: 2});
                 }
             })
             .catch(error => {
                 layer.close(loadingIndex);
 
                 // 显示错误信息
-                layer.msg(error.message || '提交异常', { icon: 2 });
+                layer.msg(error.message || '提交异常', {icon: 2});
 
                 // 如果是网络错误，不自动关闭页面
                 if (error.originalError) {
@@ -217,7 +222,7 @@ layui.use(['form', 'layer'], function () {
         $('#userEmail').on('blur', function () {
             const email = $(this).val();
             if (email && !isValidEmail(email)) {
-                layer.tips('邮箱格式不正确', this, { tips: 1 });
+                layer.tips('邮箱格式不正确', this, {tips: 1});
             }
         });
 
@@ -225,7 +230,7 @@ layui.use(['form', 'layer'], function () {
         $('#userMobilePhone').on('blur', function () {
             const phone = $(this).val();
             if (phone && !isValidPhone(phone)) {
-                layer.tips('手机号格式不正确', this, { tips: 1 });
+                layer.tips('手机号格式不正确', this, {tips: 1});
             }
         });
     }

imwork-windows/imwork-silos/src/main/resources/static/business/upms/user/js/list.js

@@ -39,6 +39,14 @@ layui.config({
         '2': '保密',
         '_default': '保密'
     };
+    // 内外网映射
+    const NET_MAP = {
+        '0': '内网',
+        '1': '外网',
+        '2': '专用',
+        '9': '通用',
+        '_default': '通用'
+    };
 
     /**
      * 格式化时间显示
@@ -83,14 +91,23 @@ layui.config({
             content: '/upms/user/edit.html',
             area: ['95%', '95%'],
             success: function (layero, index) {
-                const body = layer.getChildFrame('body', index);
+                const body = layui.layer.getChildFrame('body', index);
                 if (editData) {
                     // 填充表单数据
+                    body.find('#id').val(editData.id);
                     body.find('.userName').val(editData.userName);
+                    body.find('.loginName').val(editData.loginName);
+                    body.find('.userAddress').val(editData.userAddress);
+                    body.find('.userIdCard').val(editData.userIdCard);
+                    body.find('.userMobilePhone').val(editData.userMobilPhone);
                     body.find('.userEmail').val(editData.userEmail);
-                    body.find(`.userSex input[value="${editData.userSex}"]`).prop('checked', true);
+                    body.find('.userNickName').val(editData.userNickName);
+                    body.find('.remark').val(editData.remark);
+                    body.find(`.dncnet input[value="${editData.dncnet}"]`).prop('checked', true);
+                    body.find(`.userStatus input[value="${editData.userStatus}"]`).prop('checked', true);
+                    body.find(`.userType input[value="${editData.userType}"]`).prop('checked', true);
+                    body.find(`.userGender input[value="${editData.userGender}"]`).prop('checked', true);
                     body.find('.userGrade').val(editData.userGrade);
-                    body.find('.userStatus').val(editData.userStatus);
                     body.find('.userDesc').text(editData.userDesc);
                     form.render();
                 }
@@ -274,7 +291,7 @@ layui.config({
                         : '';
                 }
             },
-            { field: 'userMobilePhone', title: '手机号码', align: 'center' },
+            { field: 'userMobilPhone', title: '手机号码', align: 'center' },
             {
                 field: 'userType',
                 title: '用户类型',
@@ -283,6 +300,14 @@ layui.config({
                     return getMappedValue(d.userType, USER_TYPE_MAP);
                 }
             },
+            {
+                field: 'dncnet',
+                title: '内外网',
+                align: 'center',
+                templet: function (d) {
+                    return getMappedValue(d.dncnet, NET_MAP);
+                }
+            },
             {
                 field: 'userStatus',
                 title: '用户状态',

imwork-windows/imwork-silos/src/main/resources/templates/upms/user/edit.html

@@ -37,6 +37,7 @@
         </div>
     </div>-->
     <div class="layui-row childrenRow">
+        <input type="hidden" id="id" name="id">
         <div class="magb15 layui-col-md6 layui-col-xs12">
             <label class="layui-form-label">用户名</label>
             <div class="layui-input-block">
@@ -52,7 +53,24 @@
             </div>
         </div>
     </div>
-
+    <div class="layui-row childrenRow">
+        <div class="magb15 layui-col-md6 layui-col-xs12">
+            <label class="layui-form-label">身份证号</label>
+            <div class="layui-input-block">
+                <input type="text" id="userIdCard" name="userIdCard" class="layui-input userIdCard" lay-verify="required"
+                       placeholder="请输入身份证号">
+            </div>
+        </div>
+        <div class="magb15 layui-col-md6 layui-col-xs12">
+            <label class="layui-form-label">单点登陆</label>
+            <div class="layui-input-block">
+                <select id="isDifferentIpLogin" name="isDifferentIpLogin" class="isDifferentIpLogin" lay-filter="isDifferentIpLogin">
+                    <option value="0">不支持</option>
+                    <option value="1">支持</option>
+                </select>
+            </div>
+        </div>
+    </div>
     <div class="layui-row childrenRow">
         <div class="magb15 layui-col-md6 layui-col-xs12">
             <label class="layui-form-label">用户地址</label>
@@ -81,7 +99,7 @@
         <div class="magb15 layui-col-md6 layui-col-xs12">
             <label class="layui-form-label">网络类型</label>
             <div class="layui-input-block">
-                <select id="allowedNetworkType" name="allowedNetworkType" class="allowedNetworkType" lay-filter="allowedNetworkType">
+                <select id="dncnet" name="dncnet" class="dncnet" lay-filter="dncnet">
                     <option value="">全部</option>
                     <option value="0">内网</option>
                     <option value="1">外网</option>
@@ -101,9 +119,9 @@
         <div class="magb15 layui-col-md6 layui-col-xs12">
             <label class="layui-form-label">性别</label>
             <div id="userGender" class="layui-input-block userGender">
-                <input type="radio" name="sex" value="0" title="男">
-                <input type="radio" name="sex" value="1" title="女">
-                <input type="radio" name="sex" value="2" title="保密" checked>
+                <input type="radio" name="userGender" value="0" title="男">
+                <input type="radio" name="userGender" value="1" title="女">
+                <input type="radio" name="userGender" value="2" title="保密" checked>
             </div>
         </div>
     </div>

imwork-windows/imwork-silos/src/main/resources/templates/upms/user/list.html

@@ -154,6 +154,7 @@
                     <option value="0">内网</option>
                     <option value="1">外网</option>
                     <option value="2">专用</option>
+                    <option value="9">通用</option>
                 </select>
             </div>
             <div class="form-group">

imwork-windows/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>top.imwork</groupId>
         <artifactId>imwork-plus</artifactId>
-        <version>2025.12.1.0</version>
+        <version>2025.12.1.1</version>
     </parent>
 
     <artifactId>imwork-windows</artifactId>

pom.xml

@@ -21,7 +21,7 @@
 
     <groupId>top.imwork</groupId>
     <artifactId>imwork-plus</artifactId>
-    <version>2025.12.1.0</version>
+    <version>2025.12.1.1</version>
     <packaging>pom</packaging>
 
     <name>${project.artifactId}</name>