java/zhihuishenqu.git

			@@ -185,8 +185,8 @@
			// }else{
			// vo.setRelation(Integer.valueOf(relation));
			// }
			String relation = convertMarriage(oneData.get(5));
			Integer isOk = PopulRelationEnum.getCodeByName(relation);
			// String relation = convertMarriage(oneData.get(5));
			Integer isOk = PopulRelationEnum.getCodeByName(oneData.get(5));
			if(isOk.equals(-1)){
			// vo.setMarriageStr(ma);
			ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
			@@ -297,8 +297,8 @@
			vo.setCultureLevel(PopulCultureLevelEnum.getCodeByName(oneData.get(18)));
			}
			if(StringUtils.isNotEmpty(oneData.get(19))){
			String ma = convertMarriage(oneData.get(19));
			Integer isOk = PopulMarriageEnum.getCodeByName(ma);
			// String ma = convertMarriage(oneData.get(19));
			Integer isOk = PopulMarriageEnum.getCodeByName(oneData.get(19));
			if(isOk.equals(-1)){
			// vo.setMarriageStr(ma);
			ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();

			@@ -349,7 +349,7 @@
			return R.fail("系统预置标签不可修改");
			}
			ComMngUserTagDO exist = comMngUserTagDAO.selectOne(new QueryWrapper<ComMngUserTagDO>().lambda().eq(ComMngUserTagDO::getTagName,comMngTagVO.getTagName()));
			if(null!=exist && exist.getId()!=comMngUserTagDO.getId()){
			if(null!=exist && !exist.getId().equals(comMngTagVO.getId())){
			return R.fail("标签重复");
			}
			comMngUserTagDO.setTagName(comMngTagVO.getTagName());

	springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationServeExcelListen.java	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/SysUserInputServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史