流程完善

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/config/ShiroConfig.java

@@ -86,7 +86,7 @@ public class ShiroConfig {
 		filterChainDefinitionMap.put("/sys/sms", "anon");//短信验证码
 		filterChainDefinitionMap.put("/sys/phoneLogin", "anon");//手机登录		
 		filterChainDefinitionMap.put("/sys/user/checkOnlyUser", "anon");//校验用户是否存在
-		filterChainDefinitionMap.put("/sys/user/register", "anon");//用户注册
+//		filterChainDefinitionMap.put("/sys/user/register", "anon");//用户注册
 //		filterChainDefinitionMap.put("/sys/user/querySysUser", "anon");//根据手机号获取用户信息
 		filterChainDefinitionMap.put("/sys/user/phoneVerification", "anon");//用户忘记密码验证手机号
 		filterChainDefinitionMap.put("/sys/user/passwordChange", "anon");//用户更改密码

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/activiti/listener/ListenerIncidentTicketList.java

@@ -61,34 +61,44 @@ public class ListenerIncidentTicketList implements TaskListener, JavaDelegate {
 			incidentTicket.setUpdateTime(new Date());
 			incidentTicket.setInvoicingDate(new Date());
 			incidentTicketService.updateById(incidentTicket);
-			List<IncidentTicketChildren> list1 = incidentTicketChildrenService.selectPlan(o.getPlanNumber());
-			if(list1.size() > 0){
 
-				String user = list1.get(0).getCreateBy();
-				if(StringUtils.isNotBlank(user)){
+				try {
+					List<IncidentTicketChildren> list1 = incidentTicketChildrenService.selectPlan(o.getPlanNumber());
+					if(list1.size() > 0){
+					String user = list1.get(0).getCreateBy();
+					if(StringUtils.isNotBlank(user)){
 
-					List<SysUser> loginUser = sysUserMapper.getUserByRealName(user);
-					if(loginUser.size() > 0){
+						List<SysUser> loginUser = sysUserMapper.getUserByRealName(user);
+						if(loginUser.size() > 0){
 
-						if(!map.containsKey(loginUser.get(0).getUsername())){
+							if(!map.containsKey(loginUser.get(0).getUsername())){
 
-							map.put(loginUser.get(0).getUsername(),"");
+								map.put(loginUser.get(0).getUsername(),"");
 
-							IncidentTicketMsg incidentTicketMsg = new IncidentTicketMsg();
-							incidentTicketMsg.setPkIncidentTicket(id);
-							incidentTicketMsg.setUserId(loginUser.get(0).getUsername());
-							incidentTicketMsg.setUserName(loginUser.get(0).getRealname());
+								IncidentTicketMsg incidentTicketMsg = new IncidentTicketMsg();
+								incidentTicketMsg.setPkIncidentTicket(id);
+								incidentTicketMsg.setUserId(loginUser.get(0).getUsername());
+								incidentTicketMsg.setUserName(loginUser.get(0).getRealname());
 
-							incidentTicketMsgService.save(incidentTicketMsg);
+								incidentTicketMsgService.save(incidentTicketMsg);
+							}
+
+							o.setRemark(loginUser.get(0).getRealname());
+							incidentTicketChildrenService.updateById(o);
 						}
 
-						o.setRemark(loginUser.get(0).getRealname());
-						incidentTicketChildrenService.updateById(o);
 					}
-
+					}
+				}catch (Exception e){
+					System.out.println("=============PlanNumber为空==============");
+					System.out.println("=============PlanNumber为空==============");
+					System.out.println("===========PlanNumber为空================");
+					System.out.println("=============PlanNumber为空==============");
+					System.out.println("=============PlanNumber为空==============");
 				}
 
-			}
+
+
 		}
 
 	}

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/mapper/xml/IncidentTicketChildrenMapper.xml

@@ -16,6 +16,6 @@
 	
 	
 	<select id="selectPlan" parameterType="java.lang.String" resultType="org.jeecg.modules.oa.entity.IncidentTicketChildren">
-		select plan_man createBy,remarks remark from view_sy_plan_statistics where plan_num = #{planNum} and del_flag='0'
+		select id,plan_man createBy,remarks remark from view_sy_plan_statistics where plan_num = #{planNum} and del_flag='0'
 	</select>
 </mapper>

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java

@@ -745,6 +745,9 @@ public class SysUserController {
                 if (StringUtils.isNotBlank(item.getNMarriage()) && item.getNMarriage().equals("0")) {
                     item.setNMarriage("否");
                 }
+                if (StringUtils.isNotBlank(item.getNMarriage()) && item.getNMarriage().equals("2")) {
+                    item.setNMarriage("离异");
+                }
                 if (StringUtils.isNotBlank(item.getPost()) && map.containsKey(item.getPost())) {
                     item.setPost(map.get(item.getPost()));
                 }
@@ -1257,82 +1260,82 @@ public class SysUserController {
     }
 
 
-    /**
-     * 用户注册接口
-     *
-     * @param jsonObject
-     * @param user
-     * @return
-     */
-    @PostMapping("/register")
-    public Result<JSONObject> userRegister(@RequestBody JSONObject jsonObject, SysUser user) {
-        Result<JSONObject> result = new Result<JSONObject>();
-        String phone = jsonObject.getString("phone");
-        String smscode = jsonObject.getString("smscode");
-        Object code = redisUtil.get(phone);
-        String username = jsonObject.getString("username");
-        //未设置用户名，则用手机号作为用户名
-        if (oConvertUtils.isEmpty(username)) {
-            username = phone;
-        }
-        //未设置密码，则随机生成一个密码
-        String password = jsonObject.getString("password");
-        if (oConvertUtils.isEmpty(password)) {
-            password = RandomUtil.randomString(8);
-        }
-        String email = jsonObject.getString("email");
-        SysUser sysUser1 = sysUserService.getUserByName(username);
-        if (sysUser1 != null) {
-            result.setMessage("用户名已注册");
-            result.setSuccess(false);
-            return result;
-        }
-        SysUser sysUser2 = sysUserService.getUserByPhone(phone);
-        if (sysUser2 != null) {
-            result.setMessage("该手机号已注册");
-            result.setSuccess(false);
-            return result;
-        }
-
-        if (oConvertUtils.isNotEmpty(email)) {
-            SysUser sysUser3 = sysUserService.getUserByEmail(email);
-            if (sysUser3 != null) {
-                result.setMessage("邮箱已被注册");
-                result.setSuccess(false);
-                return result;
-            }
-        }
-        //todo 暂无短信服务
-		/*if (!smscode.equals(code)) {
-			result.setMessage("手机验证码错误");
-			result.setSuccess(false);
-			return result;
-		}*/
-
-        try {
-            user.setCreateTime(new Date());// 设置创建时间
-            String salt = oConvertUtils.randomGen(8);
-            String passwordEncode = PasswordUtil.encrypt(username, password, salt);
-            user.setSalt(salt);
-            user.setUsername(username);
-            user.setRealname(username);
-            user.setPassword(passwordEncode);
-
-            String password2 = MD5Util.MD5Encode(password, "");
-            user.setPassword2(password2);
-
-            user.setEmail(email);
-            user.setPhone(phone);
-            user.setStatus(1);
-            user.setDelFlag(CommonConstant.DEL_FLAG_0.toString());
-            user.setActivitiSync(CommonConstant.ACT_SYNC_1);
-            sysUserService.addUserWithRole(user, "ee8626f80f7c2619917b6236f3a7f02b");//默认临时角色 test
-            result.success("注册成功");
-        } catch (Exception e) {
-            result.error500("注册失败");
-        }
-        return result;
-    }
+//    /**
+//     * 用户注册接口
+//     *
+//     * @param jsonObject
+//     * @param user
+//     * @return
+//     */
+//    @PostMapping("/register")
+//    public Result<JSONObject> userRegister(@RequestBody JSONObject jsonObject, SysUser user) {
+//        Result<JSONObject> result = new Result<JSONObject>();
+//        String phone = jsonObject.getString("phone");
+//        String smscode = jsonObject.getString("smscode");
+//        Object code = redisUtil.get(phone);
+//        String username = jsonObject.getString("username");
+//        //未设置用户名，则用手机号作为用户名
+//        if (oConvertUtils.isEmpty(username)) {
+//            username = phone;
+//        }
+//        //未设置密码，则随机生成一个密码
+//        String password = jsonObject.getString("password");
+//        if (oConvertUtils.isEmpty(password)) {
+//            password = RandomUtil.randomString(8);
+//        }
+//        String email = jsonObject.getString("email");
+//        SysUser sysUser1 = sysUserService.getUserByName(username);
+//        if (sysUser1 != null) {
+//            result.setMessage("用户名已注册");
+//            result.setSuccess(false);
+//            return result;
+//        }
+//        SysUser sysUser2 = sysUserService.getUserByPhone(phone);
+//        if (sysUser2 != null) {
+//            result.setMessage("该手机号已注册");
+//            result.setSuccess(false);
+//            return result;
+//        }
+//
+//        if (oConvertUtils.isNotEmpty(email)) {
+//            SysUser sysUser3 = sysUserService.getUserByEmail(email);
+//            if (sysUser3 != null) {
+//                result.setMessage("邮箱已被注册");
+//                result.setSuccess(false);
+//                return result;
+//            }
+//        }
+//        //todo 暂无短信服务
+//		/*if (!smscode.equals(code)) {
+//			result.setMessage("手机验证码错误");
+//			result.setSuccess(false);
+//			return result;
+//		}*/
+//
+//        try {
+//            user.setCreateTime(new Date());// 设置创建时间
+//            String salt = oConvertUtils.randomGen(8);
+//            String passwordEncode = PasswordUtil.encrypt(username, password, salt);
+//            user.setSalt(salt);
+//            user.setUsername(username);
+//            user.setRealname(username);
+//            user.setPassword(passwordEncode);
+//
+//            String password2 = MD5Util.MD5Encode(password, "");
+//            user.setPassword2(password2);
+//
+//            user.setEmail(email);
+//            user.setPhone(phone);
+//            user.setStatus(1);
+//            user.setDelFlag(CommonConstant.DEL_FLAG_0.toString());
+//            user.setActivitiSync(CommonConstant.ACT_SYNC_1);
+//            sysUserService.addUserWithRole(user, "ee8626f80f7c2619917b6236f3a7f02b");//默认临时角色 test
+//            result.success("注册成功");
+//        } catch (Exception e) {
+//            result.error500("注册失败");
+//        }
+//        return result;
+//    }
 
     /**
      * 根据用户名或手机号查询用户信息