Ver código fonte

1.员工编号不允许重复修改
2.前端页面布局设置

13651387864 3 anos atrás
pai
commit
8f4681179d

+ 8 - 0
suishenbang-admin/src/main/java/com/dgtly/web/controller/system/SysUserController.java

@@ -168,6 +168,11 @@ public class SysUserController extends BaseController
         if(user.getSysUserExt()!=null){
             SysUserExt ext =user.getSysUserExt();
             ext.setUserId(user.getUserId());
+            //查询当前的员工编号是否存在
+            int ext1 = userExtService.selectSysUserExtBySapEmployeeId(ext.getSapEmployeeId());
+            if(ext1 >0){
+                return error("员工编号已存在");
+            }
             userExtService.insertOrUpSysUserExt(ext);
 
         }
@@ -175,6 +180,9 @@ public class SysUserController extends BaseController
         return toAjax(userId);
     }
 
+
+
+
     /**
      * 修改用户
      */

+ 29 - 22
suishenbang-admin/src/main/resources/templates/system/user/add.html

@@ -122,17 +122,8 @@
 
             <input  type="hidden" readonly="true" name="sysUserExt.isChangeExt" />
             <div class="row">
-                <div class="col-sm-4">
-                    <div class="form-group">
-                        <label class="col-sm-4 control-label">用户类别:</label>
-                        <input type="hidden" name="sysUserExt.salesLevel" onchange="changeLevelText">
-                        <div class="col-sm-8">
-                            <input class="form-control" type="text" readonly="true" id="salesText" />
-                        </div>
-                    </div>
-                </div>
                 <div id="diyDiv">
-                    <div class="col-sm-4">
+                    <div class="col-sm-6">
                         <div class="form-group">
                             <label class="col-sm-4 control-label">岗位名称:</label>
                             <div class="col-sm-8">
@@ -140,7 +131,7 @@
                             </div>
                         </div>
                     </div>
-                    <div class="col-sm-4">
+                    <div class="col-sm-6">
                         <div class="form-group">
                             <label class="col-sm-4 control-label">组织Code:</label>
                             <div class="col-sm-8">
@@ -148,8 +139,29 @@
                             </div>
                         </div>
                     </div>
+            </div>
+            </div>
+            <div class="row">
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label">用户类别:</label>
+                        <input type="hidden" name="sysUserExt.salesLevel" onchange="changeLevelText">
+                        <div class="col-sm-8">
+                            <input class="form-control" type="text" readonly="true" id="salesText" />
+                        </div>
+                    </div>
+                </div>
+                <div class="col-sm-6" id="sapEmployeeId">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label">员工编号:</label>
+                        <div class="col-sm-8">
+                            <input class="form-control" type="text" name="sysUserExt.sapEmployeeId"/>
+                        </div>
+                    </div>
                 </div>
             </div>
+
+
             <div id="salesDiv">
                 <div class="row">
                     <div class="col-sm-6">
@@ -207,16 +219,6 @@
                     </div>
                 </div>
             </div>
-            <div class="row">
-                <div class="col-sm-6">
-                    <div class="form-group">
-                        <label class="col-sm-4 control-label">员工编号:</label>
-                        <div class="col-sm-8">
-                            <input class="form-control" type="text" name="sysUserExt.sapEmployeeId"/>
-                        </div>
-                    </div>
-                </div>
-            </div>
             <h4 class="form-header h4">其他信息</h4>
             <div class="row">
                 <div class="col-sm-12">
@@ -348,18 +350,23 @@
     			$("#treeName").val(body.find('#treeName').val());
     			layer.close(index);
 			}
-		}function changeLevel(){
+		}
+		function changeLevel(){
             var level = $("input[name='sysUserExt.salesLevel']").val();
             if(level=="customer_level"){
                 $("#diyDiv").show();
+                $("#sapEmployeeId").show();
                 $("#customerDiv").show();
                 $("#salesDiv").hide();
             }else if(level=="diy_level"){
                 $("#diyDiv").hide();
+                $("#sapEmployeeId").hide();
                 $("#customerDiv").hide();
                 $("#salesDiv").hide();
+                $("")
             }else{
                 $("#diyDiv").show();
+                $("#sapEmployeeId").show();
                 $("#customerDiv").hide();
                 $("#salesDiv").show();
             }

+ 8 - 8
suishenbang-admin/src/main/resources/templates/system/user/edit.html

@@ -123,14 +123,6 @@
                         </div>
                     </div>
                 </div>
-                <div class="col-sm-6">
-                    <div class="form-group">
-                        <label class="col-sm-4 control-label">员工编号:</label>
-                        <div id="sapEmployeeId" class="col-sm-8">
-                            <input class="form-control" type="text" th:field="*{sysUserExt.sapEmployeeId}" value="sysUserExt.sapEmployeeId" name="sapEmployeeId"/>
-                        </div>
-                    </div>
-                </div>
             </div>
             <div id="diyDiv">
                 <div class="row">
@@ -151,6 +143,14 @@
                         </div>
                     </div>
                 </div>
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label">员工编号:</label>
+                        <div id="sapEmployeeId" class="col-sm-8">
+                            <input class="form-control" type="text" th:field="*{sysUserExt.sapEmployeeId}" value="sysUserExt.sapEmployeeId" name="sapEmployeeId"/>
+                        </div>
+                    </div>
+                </div>
             </div>
             <div id="salesDiv">
                 <div class="row">

+ 3 - 0
suishenbang-system/src/main/java/com/dgtly/system/mapper/SysUserExtMapper.java

@@ -94,4 +94,7 @@ public interface SysUserExtMapper
      * @date: 2021/4/9 9:39
      */
     int switchCustomer(@Param("userId") String userId, @Param("orgCode") String orgCode, @Param("orgName") String orgName);
+
+
+    int selectSysUserExtBySapEmployeeId(@Param("id") String sapEmployeeId);
 }

+ 2 - 0
suishenbang-system/src/main/java/com/dgtly/system/service/ISysUserExtService.java

@@ -101,4 +101,6 @@ public interface ISysUserExtService
      */
     int switchCustomer(String userId, String orgCode, String orgName);
 
+
+    int selectSysUserExtBySapEmployeeId(String sapEmployeeId);
 }

+ 6 - 0
suishenbang-system/src/main/java/com/dgtly/system/service/impl/SysUserExtServiceImpl.java

@@ -145,4 +145,10 @@ public class SysUserExtServiceImpl implements ISysUserExtService
         return sysUserExtMapper.switchCustomer(userId,orgCode,orgName);
     }
 
+    @Override
+    public int selectSysUserExtBySapEmployeeId(String sapEmployeeId) {
+        return sysUserExtMapper.selectSysUserExtBySapEmployeeId(sapEmployeeId);
+    }
+
+
 }

+ 3 - 0
suishenbang-system/src/main/resources/mapper/system/SysUserSalesExtMapper.xml

@@ -183,4 +183,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         AND user_id = #{userId}
     </select>
 
+    <select id="selectSysUserExtBySapEmployeeId" resultType="int">
+        select count(1) from sys_user_ext where sap_employee_id = #{id}
+    </select>
 </mapper>