Merge branch 'main' of https://github.com/wanggeng888/system-partybuilding into main

src/main/java/com/cm/partybuilding/pojo/dtos/partymemberorganize/PartyMemberOrganizeDTO.java

@@ -74,6 +74,8 @@ public class PartyMemberOrganizeDTO {
     private String remake;
     @ApiModelProperty(name = "userName", value = "用户名")
     private String userName;
+    @ApiModelProperty(name = "userId", value = "系统用户ID")
+    private String userId;
     @ApiModelProperty(name = "maritalStatus", value = "婚姻状况ID")
     private String maritalStatus;
     @ApiModelProperty(name = "maritalStatusName", value = "婚姻状况")
@@ -85,6 +87,14 @@ public class PartyMemberOrganizeDTO {
     @ApiModelProperty(name = "partyMembershipStatusName", value = "党籍状态")
     private String partyMembershipStatusName;
 
+    public String getUserId() {
+        return userId == null ? "" : userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
     public String getPartyMemberOrganizeId() {
         return partyMemberOrganizeId == null ? "" : partyMemberOrganizeId;
     }

src/main/java/com/cm/partybuilding/pojo/vos/partymemberorganize/PartyMemberOrganizeVO.java

@@ -77,8 +77,9 @@ public class PartyMemberOrganizeVO {
     @ApiModelProperty(name = "remake", value = "备注")
     private String remake;
     @ApiModelProperty(name = "userName", value = "用户名")
-    @CheckEmptyAnnotation(name = "用户名")
     private String userName;
+    @ApiModelProperty(name = "userId", value = "系统用户ID")
+    private String userId;
     @ApiModelProperty(name = "maritalStatus", value = "婚姻状况ID")
     private String maritalStatus;
     @ApiModelProperty(name = "maritalStatusName", value = "婚姻状况")
@@ -90,6 +91,14 @@ public class PartyMemberOrganizeVO {
     @ApiModelProperty(name = "partyMembershipStatusName", value = "党籍状态")
     private String partyMembershipStatusName;
 
+    public String getUserId() {
+        return userId == null ? "" : userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
     public String getLandline() {
         return landline == null ? "" : landline;
     }

src/main/resources/mybatis/mapper/partymemberorganize/partymemberorganize-mapper.xml

@@ -33,6 +33,7 @@
         <result column="occupation_name" property="occupationName"/>
         <result column="remake" property="remake"/>
         <result column="user_name" property="userName"/>
+        <result column="user_id" property="userId"/>
         <result column="marital_status" property="maritalStatus"/>
         <result column="marital_status_name" property="maritalStatusName"/>
         <result column="is_outofcontact" property="isOutofcontact"/>
@@ -73,6 +74,7 @@
             occupation_name,
             remake,
             user_name,
+            user_id,
             marital_status,
             marital_status_name,
             is_outofcontact,
@@ -114,6 +116,7 @@
             #{occupationName},
             #{remake},
             #{userName},
+            #{userId},
             #{maritalStatus},
             #{maritalStatusName},
             #{isOutofcontact},
@@ -245,6 +248,9 @@
         <if test="userName != null and userName != ''">
             user_name = #{userName},
         </if>
+        <if test="userId != null and userId != ''">
+            user_id = #{userId},
+        </if>
         <if test="maritalStatus != null and maritalStatus != ''">
             marital_status = #{maritalStatus},
         </if>
@@ -298,6 +304,7 @@
             t1.occupation_name,
             t1.remake,
             t1.user_name,
+            t1.user_id,
             t1.marital_status,
             t1.marital_status_name,
             t1.is_outofcontact,
@@ -346,6 +353,7 @@
             t1.occupation_name,
             t1.remake,
             t1.user_name,
+            t1.user_id,
             t1.marital_status,
             t1.marital_status_name,
             t1.is_outofcontact,

src/main/resources/static/default.html

@@ -255,7 +255,7 @@
             top.dialog.open({
                 url: top.restAjax.path('route/defaultindex/include.html?partyOrganizeId={partyOrganizeId}', [partyOrganizeId]),
                 title: '详情',
-                width: '1040px',
+                width: '1080px',
                 height: '98%',
                 onClose: function(data) {
 

src/main/resources/static/route/defaultindex/include.html

@@ -201,7 +201,7 @@
                 top.dialog.open({
                     url: top.restAjax.path(url, []),
                     title: openTitle,
-                    width: '1040px',
+                    width: '1080px',
                     height: '98%',
                     onClose: function(data) {
 

src/main/resources/static/route/partymemberorganize/save-partymemberorganize.html

@@ -81,7 +81,8 @@
                     <div class="layui-col-lg6">
                         <label class="layui-form-label">用户名<span style="color:red;">*</span></label>
                         <div class="layui-input-block">
-                            <input type="text" id="userName" name="userName" class="layui-input" value="" placeholder="请输入用户名" lay-verify="required">
+                            <input type="text" id="userName" name="userName" class="layui-input" value="" placeholder="点击选择用户">
+                            <input type="hidden" id="userId" name="userId" class="layui-input" value="">
                         </div>
                     </div>
                     <div class="layui-col-lg6">
@@ -331,6 +332,25 @@
         var wangEditorObj = {};
         var viewerObj = {};
 
+        // 点击单位类型选择输入框，弹出层方法
+        $(document).on('click', '#userName', function() {
+            top.dialog.dialogData.oldSelectedUserList = [{userId:''}];
+            top.dialog.open({
+                url: 'route/common/listselectuser?selectType=radio',
+                title: '选择用户',
+                width: '1000px',
+                height: '500px',
+                onClose: function() {
+                    var newSelectedUserList = top.dialog.dialogData.newSelectedUserList;
+                    if(newSelectedUserList.length != 0) {
+                        $('#userName').val(newSelectedUserList[0].userName);
+                        $('#userId').val(newSelectedUserList[0].userId);
+                    }
+                    top.dialog.dialogData.oldSelectedUserList = [];
+                }
+            });
+        });
+
         function valueFun(formData) {
             $("#dataForm").find('select').each(function(){
                 var value;

src/main/resources/static/route/partymemberorganize/update-partymemberorganize.html

@@ -82,6 +82,7 @@
                         <label class="layui-form-label">用户名</label>
                         <div class="layui-input-block">
                             <input type="text" id="userName" name="userName" class="layui-input" value="" placeholder="请输入用户名" >
+                            <input type="hidden" id="userId" name="userId" class="layui-input" value="">
                         </div>
                     </div>
                     <div class="layui-col-lg6">
@@ -334,6 +335,25 @@
         var wangEditorObj = {};
         var viewerObj = {};
 
+        // 点击单位类型选择输入框，弹出层方法
+        $(document).on('click', '#userName', function() {
+            top.dialog.dialogData.oldSelectedUserList = [{userId:''}];
+            top.dialog.open({
+                url: 'route/common/listselectuser?selectType=radio',
+                title: '选择用户',
+                width: '1000px',
+                height: '500px',
+                onClose: function() {
+                    var newSelectedUserList = top.dialog.dialogData.newSelectedUserList;
+                    if(newSelectedUserList.length != 0) {
+                        $('#userName').val(newSelectedUserList[0].userName);
+                        $('#userId').val(newSelectedUserList[0].userId);
+                    }
+                    top.dialog.dialogData.oldSelectedUserList = [];
+                }
+            });
+        });
+
         if(isView) {
             $('#submitBtn').hide();
         }