فهرست منبع

入职登记+客户信息ajax请求

user4 5 سال پیش
والد
کامیت
5f8bb1ab3a

+ 10 - 4
src/main/java/com/jeeplus/modules/workstaff/service/WorkStaffBasicInfoService.java

@@ -67,6 +67,8 @@ import javax.servlet.http.HttpServletRequest;
 public class WorkStaffBasicInfoService extends CrudService<WorkStaffBasicInfoDao, WorkStaffBasicInfo> {
 
     @Autowired
+    private  RoleService roleService;
+    @Autowired
     private WorkStaffAchievementService achievementService;
     @Autowired
     private WorkStaffCertificateService certificateService;
@@ -168,12 +170,16 @@ public class WorkStaffBasicInfoService extends CrudService<WorkStaffBasicInfoDao
         User user = new User();
         user.setId(workStaffBasicInfo.getUserId());
         user.setName(workStaffBasicInfo.getName());
-        userService.updateUserName(user);
-        if(workStaffBasicInfo.getRoleId() != null){
-	        userService.updateRole(workStaffBasicInfo);
-        }else{
+        if (userService.get(user.getId())!=null){
+            userService.updateUserName(user);
+        }
+
+        if(roleService.getRoleIdByUserId(user.getId())==null){
             userService.insertRole(workStaffBasicInfo);
+        }else{
+            userService.updateRole(workStaffBasicInfo);
         }
+
 	}
 
     public void preSave(WorkStaffBasicInfo workStaffBasicInfo, HttpServletRequest request) throws IOException {

+ 1 - 1
src/main/webapp/webpage/modules/workclientinfo/workClientInfoForm.jsp

@@ -152,7 +152,7 @@
             $('#clientType').selectpicker('val',arr);
 
             $("#name").on("blur",function () {
-                var keyword = $(this).val;
+                var keyword = $(this).val();
                 if (keyword != null && keyword != "") {
                     $.getJSON(
                         "${ctx}/workclientinfo/workClientInfo/enterpriseSearchByName",