Ver código fonte

新增员工修改

Signed-off-by: anderx <312518615@qq.com>
anderx 5 anos atrás
pai
commit
ff186b060a

+ 3 - 1
src/main/java/com/goafanti/common/dao/PermissionMapper.java

@@ -62,9 +62,9 @@ public interface PermissionMapper {
 	String selectNameById(String id);
 	
 	List<PermissionBo> selectAllBySuperId (String superId);
-	
 	String selectAutNoByNamei(String name);
 	
+	
 	String selectIdByName(String name);
 	
 	int selectCountByid(String id);
@@ -74,4 +74,6 @@ public interface PermissionMapper {
 	List<SubMenu> selectMenuList(@Param("superId")String superId,@Param("aid")String aid);
 
 	String selectTopNavBySubUrl(@Param("subUrl")String subUrl);
+
+	int selectIdByNameCount(@Param("name")String name,@Param("id")String id);
 }

+ 7 - 0
src/main/java/com/goafanti/common/mapper/PermissionMapper.xml

@@ -278,6 +278,13 @@
 		where
 		name=#{name,jdbcType=VARCHAR}
   </select>
+  
+  <select id="selectIdByNameCount" resultType="java.lang.Integer">
+		select count(*)
+		from permission
+		where
+		name=#{name,jdbcType=VARCHAR} and id != #{id,jdbcType=VARCHAR}
+  </select>
   <select id="selectCountByid" parameterType="java.lang.String" resultType="java.lang.Integer" >
   		select
   		count(0)

+ 1 - 1
src/main/java/com/goafanti/permission/controller/NewPermissionApiController.java

@@ -155,7 +155,7 @@ public class NewPermissionApiController extends BaseApiController {
 			res.getError().add(buildError("","名称、路径、上级不能为空"));
 			return res;
 		}
-		if(permissionService.checkName(record.getName())){
+		if(permissionService.checkName(record.getName(),record.getId())){
 			res.getError().add(buildError(ErrorConstants.PARAM_BEING_ERROR,"名称"));
 			return res;
 		}

+ 1 - 1
src/main/java/com/goafanti/permission/service/PermissionService.java

@@ -42,5 +42,5 @@ public interface PermissionService {
 	/** 查询 一级菜单通过三级菜单 **/
 	String selectTopNavBySubUrl(String subUrl);
 
-	boolean checkName(String name);
+	boolean checkName(String name, String string);
 }

+ 3 - 3
src/main/java/com/goafanti/permission/service/impl/PermissionServiceImpl.java

@@ -289,9 +289,9 @@ public class PermissionServiceImpl extends BaseMybatisDao<PermissionMapper> impl
 	}
 
 	@Override
-	public boolean checkName(String name) {
-		String str=permissionMapper.selectIdByName(name);
-		if (org.apache.commons.lang3.StringUtils.isNotBlank(str)) {
+	public boolean checkName(String name,String id) {
+		int i=permissionMapper.selectIdByNameCount(name,id);
+		if (i>0) {
 			return true;
 		}
 		return false;

+ 10 - 0
src/main/java/com/goafanti/personnel/service/impl/PersonnelServiceImpl.java

@@ -25,6 +25,7 @@ import com.goafanti.common.bo.CityBo;
 import com.goafanti.common.bo.Error;
 import com.goafanti.common.bo.ProvinceBo;
 import com.goafanti.common.constant.AFTConstants;
+import com.goafanti.common.dao.AdminMapper;
 import com.goafanti.common.dao.DistrictGlossoryMapper;
 import com.goafanti.common.dao.PersonnelChooseMapper;
 import com.goafanti.common.dao.PersonnelContactMapper;
@@ -37,6 +38,7 @@ import com.goafanti.common.dao.PersonnelPromotionMapper;
 import com.goafanti.common.dao.PersonnelQuitMapper;
 import com.goafanti.common.dao.PersonnelWelfareMapper;
 import com.goafanti.common.error.BusinessException;
+import com.goafanti.common.model.Admin;
 import com.goafanti.common.model.PersonnelContact;
 import com.goafanti.common.model.PersonnelDossier;
 import com.goafanti.common.model.PersonnelEntry;
@@ -85,9 +87,17 @@ public class PersonnelServiceImpl  extends BaseMybatisDao<PersonnelDossierMapper
 	private PersonnelMidMapper	personnelMidMapper;
 	@Autowired
 	private DistrictGlossoryMapper	districtGlossoryMapper;
+	@Autowired
+	private AdminMapper	adminMapper;
 	
 	@Override
 	public int addPersonnel(InputPersonnelBo i) {
+		if (TokenManager.hasRole(AFTConstants.SALESMAN_ADMIN)) {
+			Admin a=adminMapper.selectByPrimaryKey(TokenManager.getAdminId());
+			if (a!=null) {
+				i.setCompany(a.getDepartmentId());
+			}
+		}
 		return personnelDossierMapper.insertSelective(i);
 	}