| 
															
																@ -208,7 +208,7 @@ public class BaseOrgService extends BaseJpaService<BaseOrgDO, BaseOrgDao> { 
															 | 
														
													
												
													
														
															| 
															 | 
															
																    public JSONObject queryOneById(String id) throws JsonProcessingException { 
															 | 
															
															 | 
															
																    public JSONObject queryOneById(String id) throws JsonProcessingException { 
															 | 
														
													
												
													
														
															| 
															 | 
															
																        JSONObject result = new JSONObject(); 
															 | 
															
															 | 
															
																        JSONObject result = new JSONObject(); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																        if(StringUtils.isEmpty(id)){ 
															 | 
															
															 | 
															
																        if(StringUtils.isEmpty(id)){ 
															 | 
														
													
												
													
														
															| 
															 | 
															
																            result.put("msg","org not exist for id:"+id); 
															 | 
															
															 | 
															
																 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																            result.put("msg","该机构不存在 id:"+id); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																            result.put("response",ConstantUtils.FAIL); 
															 | 
															
															 | 
															
																            result.put("response",ConstantUtils.FAIL); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																            return result; 
															 | 
															
															 | 
															
																            return result; 
															 | 
														
													
												
													
														
															| 
															 | 
															
																        } 
															 | 
															
															 | 
															
																        } 
															 | 
														
													
												
											
												
													
														
															 | 
															
																@ -236,7 +236,7 @@ public class BaseOrgService extends BaseJpaService<BaseOrgDO, BaseOrgDao> { 
															 | 
														
													
												
													
														
															| 
															 | 
															
																            String mobile = orgAdminJson.getString("mobile"); 
															 | 
															
															 | 
															
																            String mobile = orgAdminJson.getString("mobile"); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																            String adminName = orgAdminJson.getString("orgAdmin"); 
															 | 
															
															 | 
															
																            String adminName = orgAdminJson.getString("orgAdmin"); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																            if(StringUtils.isEmpty(mobile)){ 
															 | 
															
															 | 
															
																            if(StringUtils.isEmpty(mobile)){ 
															 | 
														
													
												
													
														
															| 
															 | 
															
																                return "paramter for admin is null"; 
															 | 
															
															 | 
															
																 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																                return "联系电话不能为空!"; 
															 | 
														
													
												
													
														
															| 
															 | 
															
																            } 
															 | 
															
															 | 
															
																            } 
															 | 
														
													
												
													
														
															| 
															 | 
															
																            baseOrgDO.setOrgAdmin(adminName); 
															 | 
															
															 | 
															
																            baseOrgDO.setOrgAdmin(adminName); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																            baseOrgDO.setAdminMobile(mobile); 
															 | 
															
															 | 
															
																            baseOrgDO.setAdminMobile(mobile); 
															 | 
														
													
												
											
												
													
														
															 | 
															
																@ -268,7 +268,7 @@ public class BaseOrgService extends BaseJpaService<BaseOrgDO, BaseOrgDao> { 
															 | 
														
													
												
													
														
															| 
															 | 
															
																        }else{ 
															 | 
															
															 | 
															
																        }else{ 
															 | 
														
													
												
													
														
															| 
															 | 
															
																            BaseOrgDO oldBaseOrgDO = baseOrgDao.findOne(baseOrgDO.getId()); 
															 | 
															
															 | 
															
																            BaseOrgDO oldBaseOrgDO = baseOrgDao.findOne(baseOrgDO.getId()); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																            if(null == oldBaseOrgDO){ 
															 | 
															
															 | 
															
																            if(null == oldBaseOrgDO){ 
															 | 
														
													
												
													
														
															| 
															 | 
															
																                return "no exist this org"; 
															 | 
															
															 | 
															
																 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																                return "机构不存在"; 
															 | 
														
													
												
													
														
															| 
															 | 
															
																            } 
															 | 
															
															 | 
															
																            } 
															 | 
														
													
												
													
														
															| 
															 | 
															
																            if(!baseOrgDO.getCode().equalsIgnoreCase(oldBaseOrgDO.getCode()) || !baseOrgDO.getName().equalsIgnoreCase(oldBaseOrgDO.getName())){ 
															 | 
															
															 | 
															
																            if(!baseOrgDO.getCode().equalsIgnoreCase(oldBaseOrgDO.getCode()) || !baseOrgDO.getName().equalsIgnoreCase(oldBaseOrgDO.getName())){ 
															 | 
														
													
												
													
														
															| 
															 | 
															
																                orgTreeService.updateOrgTreeNode(oldBaseOrgDO,baseOrgDO,OrgTree.Level.org.getLevelValue()); 
															 | 
															
															 | 
															
																                orgTreeService.updateOrgTreeNode(oldBaseOrgDO,baseOrgDO,OrgTree.Level.org.getLevelValue()); 
															 | 
														
													
												
											
												
													
														
															 | 
															
																@ -309,13 +309,13 @@ public class BaseOrgService extends BaseJpaService<BaseOrgDO, BaseOrgDao> { 
															 | 
														
													
												
													
														
															| 
															 | 
															
																    public String enableOrDisableOrg(String id,String del){ 
															 | 
															
															 | 
															
																    public String enableOrDisableOrg(String id,String del){ 
															 | 
														
													
												
													
														
															| 
															 | 
															
																        JSONObject result = new JSONObject(); 
															 | 
															
															 | 
															
																        JSONObject result = new JSONObject(); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																        if(StringUtils.isEmpty(id) || StringUtils.isEmpty(del)){ 
															 | 
															
															 | 
															
																        if(StringUtils.isEmpty(id) || StringUtils.isEmpty(del)){ 
															 | 
														
													
												
													
														
															| 
															 | 
															
																            result.put("msg","parameter id or del is null"); 
															 | 
															
															 | 
															
																 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																            result.put("msg","参数id or del 为空"); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																            result.put("response",ConstantUtils.FAIL); 
															 | 
															
															 | 
															
																            result.put("response",ConstantUtils.FAIL); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																            return result.toJSONString(); 
															 | 
															
															 | 
															
																            return result.toJSONString(); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																        } 
															 | 
															
															 | 
															
																        } 
															 | 
														
													
												
													
														
															| 
															 | 
															
																        BaseOrgDO baseOrgDO = baseOrgDao.findOne(id); 
															 | 
															
															 | 
															
																        BaseOrgDO baseOrgDO = baseOrgDao.findOne(id); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																        if( null == baseOrgDO ){ 
															 | 
															
															 | 
															
																        if( null == baseOrgDO ){ 
															 | 
														
													
												
													
														
															| 
															 | 
															
																            result.put("msg","org not exist for id:" + id); 
															 | 
															
															 | 
															
																 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																            result.put("msg","该机构不存在 id:" + id); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																            result.put("response",ConstantUtils.FAIL); 
															 | 
															
															 | 
															
																            result.put("response",ConstantUtils.FAIL); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																            return result.toJSONString(); 
															 | 
															
															 | 
															
																            return result.toJSONString(); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																        } 
															 | 
															
															 | 
															
																        } 
															 |