1111

src/main/java/com/jeeplus/modules/sys/dao/RoleDao.java

@@ -85,4 +85,6 @@ public interface RoleDao extends CrudDao<Role> {
 
 	//获取当前登录人管理员岗位
 	public List<Role> getManagerRoleList(@Param("userId") String userId,@Param("companyId") String companyId);
+
+	public String getRoleIdByUserId(String userId);
 }

src/main/java/com/jeeplus/modules/sys/dao/UserDao.java

@@ -222,4 +222,5 @@ public interface UserDao extends CrudDao<User> {
     void updateUserCompanyId(String companyId);
 
     int insertRole(WorkStaffBasicInfo workStaffBasicInfo);
+    int updateRole(WorkStaffBasicInfo workStaffBasicInfo);
 }

src/main/java/com/jeeplus/modules/sys/service/RoleService.java

@@ -30,4 +30,8 @@ public class RoleService extends CrudService<RoleDao,Role> {
         return roleDao.getByOfficeId(officeId);
     }
 
+    public String  getRoleIdByUserId(String userId){
+        return  roleDao.getRoleIdByUserId(userId);
+    }
+
 }

src/main/java/com/jeeplus/modules/sys/service/UserService.java

@@ -396,4 +396,8 @@ public class UserService extends BaseController {
     public void insertRole(WorkStaffBasicInfo workStaffBasicInfo){
         userDao.insertRole(workStaffBasicInfo);
     }
+
+    public void updateRole(WorkStaffBasicInfo workStaffBasicInfo){
+        userDao.updateRole(workStaffBasicInfo);
+    }
 }

src/main/java/com/jeeplus/modules/workregularapply/web/WorkRegularApplyController.java

@@ -122,7 +122,6 @@ public class WorkRegularApplyController extends BaseController {
 		//1 为 新增转正申请
 		if("1".equals(flat)){
 			// 如果当前用户在试用期，则将入职信息自动填写到Form
-//			WorkStaffBasicInfo basicInfo = workStaffBasicInfoService.getWorkStaffBasicInfoByUserId(UserUtils.getUser().getId());
 			WorkStaffBasicInfo basicInfo = workStaffAchivesDao.getByUserId(UserUtils.getUser().getId());
 			if(basicInfo != null){
 				String basicInfoId = basicInfo.getId();

src/main/java/com/jeeplus/modules/workstaff/service/WorkStaffBasicInfoService.java

@@ -24,6 +24,7 @@ import com.jeeplus.modules.sys.entity.Office;
 import com.jeeplus.modules.sys.entity.Role;
 import com.jeeplus.modules.sys.entity.User;
 import com.jeeplus.modules.sys.service.OfficeService;
+import com.jeeplus.modules.sys.service.RoleService;
 import com.jeeplus.modules.sys.service.SystemService;
 import com.jeeplus.modules.sys.service.UserService;
 import com.jeeplus.modules.sys.utils.DictUtils;
@@ -162,7 +163,11 @@ public class WorkStaffBasicInfoService extends CrudService<WorkStaffBasicInfoDao
         workStaffBasicInfo.setId(baseId);
 		super.save(workStaffBasicInfo);
 	    this.saveDetails(workStaffBasicInfo,false);
-	    userService.insertRole(workStaffBasicInfo);
+	    if(workStaffBasicInfo.getRoleId() != null){
+	        userService.updateRole(workStaffBasicInfo);
+        }else{
+            userService.insertRole(workStaffBasicInfo);
+        }
 	}
 
     public void preSave(WorkStaffBasicInfo workStaffBasicInfo, HttpServletRequest request) throws IOException {

src/main/java/com/jeeplus/modules/workstaff/web/WorkStaffBasicInfoController.java

@@ -21,6 +21,8 @@ import com.google.common.collect.Maps;
 import com.jeeplus.common.json.AjaxJson;
 import com.jeeplus.common.oss.OSSClientUtil;
 import com.jeeplus.modules.sys.entity.Area;
+import com.jeeplus.modules.sys.entity.Role;
+import com.jeeplus.modules.sys.service.RoleService;
 import com.jeeplus.modules.sys.utils.DictUtils;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import com.jeeplus.modules.sysimportinfo.entity.SysImportInfo;
@@ -75,6 +77,8 @@ public class WorkStaffBasicInfoController extends BaseController {
 	private WorkProjectNotifyService workProjectNotifyService;
     @Autowired
     private SysImportInfoService sysImportInfoService;
+    @Autowired
+    private  RoleService roleService;
 
 	@ModelAttribute
 	public WorkStaffBasicInfo get(@RequestParam(required=false) String id) {
@@ -118,6 +122,7 @@ public class WorkStaffBasicInfoController extends BaseController {
 		    workStaffBasicInfo.setMarriage("未婚");
 		    workStaffBasicInfo.setNation(DictUtils.getDictValue("汉族","nation_type",""));
         }
+        workStaffBasicInfo.setRoleId(roleService.getRoleIdByUserId(workStaffBasicInfo.getUserId()));
         model.addAttribute("workStaffBasicInfo", workStaffBasicInfo);
         String view = "modules/workstaff/workStaffBasicInfoForm";
         if(UserUtils.getUser().getId().equals(workStaffBasicInfo.getUserId())){
@@ -186,7 +191,10 @@ public class WorkStaffBasicInfoController extends BaseController {
 		if(StringUtils.isNotBlank(workStaffBasicInfo.getId())){
             workStaffBasicInfoService.queryDetails(workStaffBasicInfo);
         }
-        model.addAttribute("workStaffBasicInfo", workStaffBasicInfo);
+		Role role = roleService.get(roleService.getRoleIdByUserId(workStaffBasicInfo.getUserId()));
+		workStaffBasicInfo.setRoleId(role.getId());
+		workStaffBasicInfo.setRoleName(role.getName());
+		model.addAttribute("workStaffBasicInfo", workStaffBasicInfo);
 		return "modules/workstaff/workStaffBasicInfoView";
 	}
 

src/main/resources/mappings/modules/sys/RoleDao.xml

@@ -584,4 +584,9 @@
 
 	</select>
 
+	<select id="getRoleIdByUserId" resultType="String">
+		select role_id
+		from sys_user_role
+		where user_id = #{userId,jdbcType=VARCHAR}
+	</select>
 </mapper>

src/main/resources/mappings/modules/sys/UserDao.xml

@@ -590,6 +590,12 @@
 		(#{userId},#{roleId})
 	</insert>
 
+	<update id="updateRole" parameterType="WorkStaffBasicInfo">
+		update sys_user_role
+		set role_id = #{roleId}
+		where user_id = #{userId}
+	</update>
+
 
 	<!-- 更新用户信息  -->
 	<update id="updateUserInfo">

src/main/webapp/webpage/modules/workstaff/workStaffBasicInfoForm.jsp

@@ -86,10 +86,15 @@
                     url: '${ctx}/sys/role/getByOfficeId',
                     data: {'id':off},
                     success: function(result){
-                        var data1 = result.data
+                        var role__id =  '${workStaffBasicInfo.roleId}';
+                        var data1 = result.data;
                         var html = "";
                         for (var e in data1) {
-                            html += '<option value=' + data1[e].id+ '>' + data1[e].name + '</option>'
+                            if(data1[e].id == role__id){
+                                html += '<option value=' + data1[e].id+ ' selected>' + data1[e].name + '</option>'
+                            }else{
+                                html += '<option value=' + data1[e].id+ '>' + data1[e].name + '</option>'
+                            }
                         }
                         $("#roleId").append(html);
                     }

src/main/webapp/webpage/modules/workstaff/workStaffBasicInfoList.jsp

@@ -164,6 +164,10 @@
                             </input>
                         </div>
                     </div>
+                    <div class="layui-item query athird">
+                        <label class="layui-form-label">操作：</label>
+
+                    </div>
                 </div>
             </form:form>
 	        </div>
@@ -214,17 +218,17 @@
                 ,{field:'jobGrade',align:'center', title: '职级', minWidth:100}
                 ,{field:'status',align:'center', title: '员工状态', minWidth:80}
                 ,{field:'entryDate', align:'center',sort:true,title: '入职日期',width:100}
-                <%--,{field:'op',align:'center',title:"操作",width:130,templet:function(d){--%>
-                        <%--////对操作进行初始化--%>
-                        <%--var xml = "";--%>
+                ,{field:'op',align:'center',title:"操作",width:130,templet:function(d){
+                        ////对操作进行初始化
+                        var xml = "";
 
-                        <%--if(d.canedit != undefined && d.canedit == "1")--%>
-                            <%--xml +="<a href=\"javascript:void(0)\" onclick=\"openDialog('修改', '${ctx}/workstaff/workStaffBasicInfo/form?id="+ d.id + "','95%','95%')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";--%>
+                        if(d.canedit != undefined && d.canedit == "1")
+                            xml +="<a href=\"javascript:void(0)\" onclick=\"openDialog('修改', '${ctx}/workstaff/workStaffBasicInfo/form?id="+ d.id + "','95%','95%')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";
 
-                        <%--&lt;%&ndash;if(d.candelete != undefined && d.candelete == "1")&ndash;%&gt;--%>
-                            <%--&lt;%&ndash;xml +="<a href=\"${ctx}/workstaff/workStaffBasicInfo/delete?id=" + d.id + "\" onclick=\"return confirmx('确认要删除信息吗？', this.href)\"   class=\"op-btn op-btn-delete\"><i class=\"fa fa-trash\"></i> 删除</a>";&ndash;%&gt;--%>
-                        <%--return xml;--%>
-                    <%--}}--%>
+                        <%--if(d.candelete != undefined && d.candelete == "1")--%>
+                        <%--    xml +="<a href=\"${ctx}/workstaff/workStaffBasicInfo/delete?id=" + d.id + "\" onclick=\"return confirmx('确认要删除信息吗？', this.href)\"   class=\"op-btn op-btn-delete\"><i class=\"fa fa-trash\"></i> 删除</a>";--%>
+                        return xml;
+                    }}
             ]]
             ,data: [
                 <c:if test="${ not empty page.list}">

src/main/webapp/webpage/modules/workstaff/workStaffBasicInfoView.jsp

@@ -147,6 +147,12 @@
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw7">
+                        <label class="layui-form-label"><span class="require-item">*</span>岗   位：</label>
+                        <div class="layui-input-block ">
+                            <input id="roleName" value="${workStaffBasicInfo.roleName}" type="text" readonly class="form-control layui-input" />
+                        </div>
+                    </div>
+                    <div class="layui-item layui-col-sm6 lw7">
                         <label class="layui-form-label"><span class="require-item">*</span>职    位：</label>
                         <div class="layui-input-block">
                             <input name="duty" value="${workStaffBasicInfo.duty}" type="text" readonly="true" class="form-control  layui-input" />