出入库角色分开

src/main/java/com/chinaitop/depot/system/controller/UserInfoController.java

@@ -597,9 +597,10 @@ public class UserInfoController {
 	@ApiOperation(value="保存用户", notes = "保存用户信息，新增或者修改")
 	@ApiImplicitParams({
 			@ApiImplicitParam(name = "userInfoJson", value = "用户信息JSON串", paramType = "form"),
-			@ApiImplicitParam(name = "userRoleIds", value = "用户角色编号，多个之间用逗号隔开", paramType = "form")
+			@ApiImplicitParam(name = "userRoleIds", value = "用户角色编号，多个之间用逗号隔开", paramType = "form"),
+			@ApiImplicitParam(name = "crkRoleIds", value = "出入库角色编号，多个之间用逗号隔开", paramType = "form")
 	})
-	public Map<String, Object> save(String userInfoJson , String userRoleIds) throws JsonParseException, JsonMappingException, IOException {
+	public Map<String, Object> save(String userInfoJson , String userRoleIds, String crkRoleIds) throws JsonParseException, JsonMappingException, IOException {
 		Map<String, Object> modelMap = new HashMap<>();
 		Pattern pattern = Pattern.compile("^[-\\+]?[\\d]*$");
 		// JSON字符串转对象
@@ -617,32 +618,25 @@ public class UserInfoController {
 			userRoleIds = userRoleIds.substring(1, userRoleIds.length());
 			userRoleIds = userRoleIds.substring(0, userRoleIds.length() - 1);
 	        String[] idArray = userRoleIds.split(",");
-	        String idArrayCrk = "[";
             userRole.setUserId(userInfo.getUserId());
             for (String id : idArray) {
-            	if(pattern.matcher(id).matches()) {//id为数字时是库级数据
-            		userRole.setRoleId(Integer.parseInt(id));
-            		userRoleService.add(userRole);
-            	} else {
-            		idArrayCrk = idArrayCrk+id+",";
-            	}
+            	userRole.setRoleId(Integer.parseInt(id));
+            	userRoleService.add(userRole);
             }
-            if("正常".equals(NetStateUtil.connectingAddress(wsdlUrl))) {
-            	try {
-            		if(idArrayCrk != "[") {
-            			idArrayCrk = idArrayCrk.substring(0,idArrayCrk.length() - 1)+"]";
-            		}else {
-            			idArrayCrk = "[]";
-            		}
-            		String json = "{userId:\""+userInfo.getUserId()+"\", roleIds:"+idArrayCrk+"}";
-            		ExchangeServer wb = new ExchangeServer();
-            		IExchangeService action = wb.getExchangeServiceImplPort();
-            		action.saveUserRoles(FLATID, KEY, json);
+		}
+		
+		if (StringUtils.isNotBlank(crkRoleIds)) {//保存出入库用户角色信息
+			if("正常".equals(NetStateUtil.connectingAddress(wsdlUrl))) {
+				try {
+					String json = "{userId:\""+userInfo.getUserId()+"\", roleIds:"+crkRoleIds+"}";
+					ExchangeServer wb = new ExchangeServer();
+					IExchangeService action = wb.getExchangeServiceImplPort();
+					action.saveUserRoles(FLATID, KEY, json);
 				} catch (Exception e) {
 					e.printStackTrace();
 				}
-            }
-	          
+			}
+			
 		}
 		
 		modelMap.put("status", "success");

src/main/java/com/chinaitop/depot/system/model/UserInfo.java

@@ -53,6 +53,8 @@ public class UserInfo implements Serializable{
     
     private List<String> roleIds = new ArrayList<String>();
     
+    private List<String> crkRoleIds = new ArrayList<String>();
+    
     //业务字段
     private String roleNames;
     
@@ -403,4 +405,13 @@ public class UserInfo implements Serializable{
 	public void setRoleIds(List<String> roleIds) {
 		this.roleIds = roleIds;
 	}
+
+	public List<String> getCrkRoleIds() {
+		return crkRoleIds;
+	}
+
+	public void setCrkRoleIds(List<String> crkRoleIds) {
+		this.crkRoleIds = crkRoleIds;
+	}
+	
 }