diff --git a/src/main/java/com/bonus/imgTool/system/controller/UserController.java b/src/main/java/com/bonus/imgTool/system/controller/UserController.java
index 4777961..4b59f76 100644
--- a/src/main/java/com/bonus/imgTool/system/controller/UserController.java
+++ b/src/main/java/com/bonus/imgTool/system/controller/UserController.java
@@ -226,7 +226,7 @@ public class UserController {
 			UserDto userDto = userService.getById(data.getData().getId());
 			List<SelectVo> projects = userService.getProjects(userDto);
 			userDto.setProjects(projects);
-			/*String loginType = userDto.getLoginType();
+			String loginType = userDto.getLoginType();
 			if (loginType != null && !loginType.isEmpty()){
 				String[] loginTypeArr = loginType.split(",");
 				List<Long> loginTypes = new ArrayList<>();
@@ -234,7 +234,7 @@ public class UserController {
 					loginTypes.add(Long.parseLong(type.trim()));
 				}
 				userDto.setLoginTypes(loginTypes);
-			}*/
+			}
 			return ServerResponse.createSuccess(userDto);
 		}catch (Exception e){
 			log.error(e.toString(),e);
diff --git a/src/main/java/com/bonus/imgTool/system/service/impl/UserServiceImpl.java b/src/main/java/com/bonus/imgTool/system/service/impl/UserServiceImpl.java
index 9c10ccd..b92c922 100644
--- a/src/main/java/com/bonus/imgTool/system/service/impl/UserServiceImpl.java
+++ b/src/main/java/com/bonus/imgTool/system/service/impl/UserServiceImpl.java
@@ -53,7 +53,7 @@ public class UserServiceImpl implements UserService {
             if (StringUtils.isNotBlank(project)){
                 for (String proId : project.split(",")) {
                     // 新增工程
-                    userDao.saveUserProject(userDto.getId(), proId);
+                    userDao.saveUserProject(user.getId(), proId);
                 }
             }
             if (num > 0) {
diff --git a/src/main/resources/mappers/system/UserMapper.xml b/src/main/resources/mappers/system/UserMapper.xml
index d17c92d..61f0383 100644
--- a/src/main/resources/mappers/system/UserMapper.xml
+++ b/src/main/resources/mappers/system/UserMapper.xml
@@ -52,12 +52,12 @@
 		</if>
 	</select>
 	<!--新增用户-->
-	<insert id="saveUser" parameterType="com.bonus.imgTool.model.SysUser" >
+	<insert id="saveUser" parameterType="com.bonus.imgTool.model.SysUser"  keyColumn="id" keyProperty="id" useGeneratedKeys="true">
 		insert into sys_user(login_name, user_name,
 		<if test="userCode != null and userCode != ''">
 			user_code,
 		</if>
-		sex, org_id,login_type, role_id, phone, user_type, state,
+		sex, org_id,login_type, role_id, user_type, state,
 		password,
 		<if test="teamId != null and teamId != ''">
 			team_id,
@@ -67,7 +67,7 @@
 		<if test="userCode != null and userCode != ''">
 			#{userCode},
 		</if>
-		#{sex}, #{orgId},#{loginType}, #{roleId}, #{phone}, #{userType},
+		#{sex}, #{orgId},#{loginType}, #{roleId}, #{userType},
 		#{state},
 		#{password},
 		<if test="teamId != null and teamId != ''">
diff --git a/src/main/resources/static/img/synthesisQuery/download_icon2.png b/src/main/resources/static/img/synthesisQuery/download_icon2.png
new file mode 100644
index 0000000..8094923
Binary files /dev/null and b/src/main/resources/static/img/synthesisQuery/download_icon2.png differ
diff --git a/src/main/resources/static/img/synthesisQuery/water_icon.png b/src/main/resources/static/img/synthesisQuery/water_icon.png
new file mode 100644
index 0000000..165e06e
Binary files /dev/null and b/src/main/resources/static/img/synthesisQuery/water_icon.png differ
diff --git a/src/main/resources/static/js/imageUpload/coordinatePhoto/child/coordinatePhotoForm.js b/src/main/resources/static/js/imageUpload/coordinatePhoto/child/coordinatePhotoForm.js
index 25b99d7..be69fcb 100644
--- a/src/main/resources/static/js/imageUpload/coordinatePhoto/child/coordinatePhotoForm.js
+++ b/src/main/resources/static/js/imageUpload/coordinatePhoto/child/coordinatePhotoForm.js
@@ -230,6 +230,8 @@ function setParams(params) {
                 majorId = selectedId;
                 majorName = selectedName;
             }
+            gxId = '';
+            gxName = '';
             let gxs = getGxsSelect(data.value);
             setSelectValueName(gxs, 'gxId', '请选择工序');
         });
@@ -351,6 +353,13 @@ function setFormData(data) {
         $('#buildUnderDesc').val(data.buildUnderDesc)
         $('#buildAfterDesc').val(data.buildAfterDesc)
 
+        proId = data.proId;
+        proName = data.proName;
+        majorId = data.majorId;
+        majorName = data.majorName;
+        gxId = data.gxId;
+        gxName = data.gxName;
+
         var sysFileResourceList = data.sysFileResourceList;
         if (sysFileResourceList && sysFileResourceList.length > 0) {
 
diff --git a/src/main/resources/static/js/imageUpload/importantMatter/child/importantMatterForm.js b/src/main/resources/static/js/imageUpload/importantMatter/child/importantMatterForm.js
index 58859d7..850a4c5 100644
--- a/src/main/resources/static/js/imageUpload/importantMatter/child/importantMatterForm.js
+++ b/src/main/resources/static/js/imageUpload/importantMatter/child/importantMatterForm.js
@@ -120,6 +120,8 @@ function setParams(params) {
                 majorId = selectedId;
                 majorName = selectedName;
             }
+            gxId = '';
+            gxName = '';
             let gxs = getGxsSelect(data.value);
             setSelectValueName(gxs, 'gxId', '请选择工序');
         });
@@ -241,6 +243,13 @@ function setFormData(data) {
         $('#title').val(data.title)
         $('#content').val(data.content)
 
+        proId = data.proId;
+        proName = data.proName;
+        majorId = data.majorId;
+        majorName = data.majorName;
+        gxId = data.gxId;
+        gxName = data.gxName;
+
         vrImgList = data.sysFileResourceList;
         var vioPhotoListEdit = data.sysFileResourceList;
         if (vioPhotoListEdit && vioPhotoListEdit.length > 0) {
diff --git a/src/main/resources/static/js/imageUpload/qualityInspection/child/qualityInspectionForm.js b/src/main/resources/static/js/imageUpload/qualityInspection/child/qualityInspectionForm.js
index 2f2ade9..0097ed1 100644
--- a/src/main/resources/static/js/imageUpload/qualityInspection/child/qualityInspectionForm.js
+++ b/src/main/resources/static/js/imageUpload/qualityInspection/child/qualityInspectionForm.js
@@ -176,6 +176,8 @@ function setParams(params) {
                 majorId = selectedId;
                 majorName = selectedName;
             }
+            gxId = '';
+            gxName = '';
             let gxs = getGxsSelect(data.value);
             setSelectValueName(gxs, 'gxId', '请选择工序');
         });
@@ -299,6 +301,13 @@ function setFormData(data) {
         $('#rectDate').val(data.rectDate)
         $('#vioDesc').val(data.vioDesc)
 
+        proId = data.proId;
+        proName = data.proName;
+        majorId = data.majorId;
+        majorName = data.majorName;
+        gxId = data.gxId;
+        gxName = data.gxName;
+
         var vioPhotoListEdit = data.vioPhotoList;
         if (vioPhotoListEdit && vioPhotoListEdit.length > 0) {
             var html = "";
diff --git a/src/main/resources/static/js/imageUpload/safetyMeasure/child/safetyMeasureForm.js b/src/main/resources/static/js/imageUpload/safetyMeasure/child/safetyMeasureForm.js
index 3f7e957..dfbca68 100644
--- a/src/main/resources/static/js/imageUpload/safetyMeasure/child/safetyMeasureForm.js
+++ b/src/main/resources/static/js/imageUpload/safetyMeasure/child/safetyMeasureForm.js
@@ -120,6 +120,8 @@ function setParams(params) {
                 majorId = selectedId;
                 majorName = selectedName;
             }
+            gxId = '';
+            gxName = '';
             let gxs = getGxsSelect(data.value);
             setSelectValueName(gxs, 'gxId', '请选择工序');
         });
@@ -242,6 +244,13 @@ function setFormData(data) {
         $('#checkPlace').val(data.checkPlace)
         $('#checkDesc').val(data.checkDesc)
 
+        proId = data.proId;
+        proName = data.proName;
+        majorId = data.majorId;
+        majorName = data.majorName;
+        gxId = data.gxId;
+        gxName = data.gxName;
+
         vrImgList = data.sysFileResourceList;
         var vioPhotoListEdit = data.sysFileResourceList;
         if (vioPhotoListEdit && vioPhotoListEdit.length > 0) {
diff --git a/src/main/resources/static/js/imageUpload/safetyViolations/child/safetyViolationsForm.js b/src/main/resources/static/js/imageUpload/safetyViolations/child/safetyViolationsForm.js
index 9b054fc..588749a 100644
--- a/src/main/resources/static/js/imageUpload/safetyViolations/child/safetyViolationsForm.js
+++ b/src/main/resources/static/js/imageUpload/safetyViolations/child/safetyViolationsForm.js
@@ -185,7 +185,8 @@ function setParams(params) {
                 majorId = selectedId;
                 majorName = selectedName;
             }
-
+            gxId = '';
+            gxName = '';
             let gxs = getGxsSelect(data.value);
             setSelectValueName(gxs, 'gxId', '请选择工序');
         });
@@ -308,6 +309,13 @@ function setFormData(data) {
         $('#rectDate').val(data.rectDate)
         $('#vioDesc').val(data.vioDesc)
 
+        proId = data.proId;
+        proName = data.proName;
+        majorId = data.majorId;
+        majorName = data.majorName;
+        gxId = data.gxId;
+        gxName = data.gxName;
+
         var vioPhotoListEdit = data.vioPhotoList;
         if (vioPhotoListEdit && vioPhotoListEdit.length > 0) {
             var html = "";
diff --git a/src/main/resources/static/js/synthesisQuery/synthesisQueryCommon.js b/src/main/resources/static/js/synthesisQuery/synthesisQueryCommon.js
index d5201cd..741ee39 100644
--- a/src/main/resources/static/js/synthesisQuery/synthesisQueryCommon.js
+++ b/src/main/resources/static/js/synthesisQuery/synthesisQueryCommon.js
@@ -3,6 +3,7 @@ function viewImg(item) {
     layer.photos({
         shade: 0.5,
         footer: false,
+        // toolbar: ['prev', 'next', 'download', 'customBtn'], // 添加自定义按钮标识
         photos: {
             "title": "图片预览",
             "start": 0,
@@ -13,6 +14,26 @@ function viewImg(item) {
                 }
             ]
         },
+        success: function(layero){
+            // 获取工具栏元素
+            var toolbar = $(layero).find('.layui-layer-photos-toolbar');
+            // 添加自定义按钮
+            var customBtn = $('<div class="layui-layer-photos-btn layui-layer-photos-customBtn" title="原图下载">'+
+                '<img style="margin-top: 15px;cursor: pointer;" src="../../img/synthesisQuery/download_icon2.png"></div>');
+            toolbar.append(customBtn);
+            // 绑定点击事件
+            customBtn.on('click', function(){
+                imgDownLoad(item,1);
+            });
+
+            var customBtn2 = $('<div class="layui-layer-photos-btn layui-layer-photos-customBtn" title="水印下载">'+
+                '<img style="margin-top: 15px;cursor: pointer;" src="../../img/synthesisQuery/water_icon.png"></div>');
+            toolbar.append(customBtn2);
+            // 绑定点击事件
+            customBtn2.on('click', function(){
+                generateWatermark(item)
+            });
+        }
     });
 }
 
diff --git a/src/main/resources/static/js/system/child/userFormTemp.js b/src/main/resources/static/js/system/child/userFormTemp.js
index 122513b..9bf4fb1 100644
--- a/src/main/resources/static/js/system/child/userFormTemp.js
+++ b/src/main/resources/static/js/system/child/userFormTemp.js
@@ -43,7 +43,7 @@ function setParams(params) {
             let loginName = $('#loginName').val();
             if (loginName) {
                 if (!(/^1[3456789]\d{9}$/.test(loginName))) {
-                    return layer.alert("请输入正确的手机号", {icon: 2})
+                    return layer.alert("登录账号请输入正确的手机号", {icon: 2})
                 }
             }
             if (!validatePassword(data.field.password)) {
@@ -287,15 +287,16 @@ function setFormData(data) {
         formSelects.value('project', selectedValues);
         /*$('#teamId').val(data.teamId)
         $('#teamId option[value=' + data.teamId + ']').attr('selected', true)*/
-        // var arrCB = data.loginTypes;
-        // for (var j = 0; j < arrCB.length; j++) {
-        //     var cbthis = $("input[name='loginType']");
-        //     for (var i = 0; i < cbthis.length; i++) {
-        //         if (cbthis[i].value == arrCB[j]) {
-        //             cbthis[i].checked = true;
-        //         }
-        //     }
-        // }
+        var arrCB = data.loginTypes;
+        console.log(arrCB+"arrCB");
+        for (var j = 0; j < arrCB.length; j++) {
+            var cbthis = $("input[name='loginType']");
+            for (var i = 0; i < cbthis.length; i++) {
+                if (cbthis[i].value == arrCB[j]) {
+                    cbthis[i].checked = true;
+                }
+            }
+        }
         layui.form.render();
     }
 }
@@ -309,16 +310,16 @@ function saveData(data) {
     let loadingMsg = layer.msg('数据上传中,请稍候...', {icon: 16, scrollbar: false, time: 0});
     let url = dataUrl + "/users/addTemp";
     let params = data.field;
-    // var arr_box = [];//固定复选框
-    // $('#cbGuDing input[type=checkbox]:checked').each(function () {
-    //     arr_box.push($(this).val());
-    // });
+    var arr_box = [];//固定复选框
+    $('#cbGuDing input[type=checkbox]:checked').each(function () {
+        arr_box.push($(this).val());
+    });
     // var arr_pro = [];//固定复选框
     // $('#project input[type=checkbox]:checked').each(function () {
     //     arr_pro.push($(this).val());
     // });
 
-    // params.loginType = arr_box.join()
+    params.loginType = arr_box.join()
     // params.project = arr_pro.join()
     // params.orgId = params.orgId_select_nodeId;
     if (params.id != "") {
diff --git a/src/main/resources/static/pages/user/child/userFormTemp.html b/src/main/resources/static/pages/user/child/userFormTemp.html
index c32cd71..d468126 100644
--- a/src/main/resources/static/pages/user/child/userFormTemp.html
+++ b/src/main/resources/static/pages/user/child/userFormTemp.html
@@ -115,7 +115,7 @@
                </div>
            </div>-->
 
-        <!--        <div class="layui-form-item">
+                <div class="layui-form-item">
                     <label class="layui-form-label"><i style="padding: 0 10px;">*</i>登录权限</label>
                     <div class="layui-input-inline" id="cbGuDing" >
                         <input type="checkbox" name="loginType" value="1" title="后台" lay-skin="primary" checked>
@@ -123,7 +123,7 @@
                         <input type="checkbox" name="loginType" value="3" title="app" lay-skin="primary">
                         <input type="hidden" id="loginType" />
                     </div>
-                </div>-->
+                </div>
 
         <div class="layui-form-item" style="margin-top: 2%;" id="pwd">
             <label class="layui-form-label"><i style="padding: 0 10px;">*</i>密码</label>