Explorar o código

Merge remote-tracking branch 'origin/master' into test

Michael %!s(int64=8) %!d(string=hai) anos
pai
achega
e6873d0427

+ 11 - 0
src/main/java/com/goafanti/admin/bo/AdminListBo.java

@@ -79,6 +79,17 @@ public class AdminListBo {
 	/** 角色 **/
 	private List<String> roles;
 	
+	/** 角色 id**/
+	private List<String> rolesId;
+	
+	public List<String> getRolesId() {
+		return rolesId;
+	}
+
+	public void setRolesId(List<String> rolesId) {
+		this.rolesId = rolesId;
+	}
+
 	public List<String> getRoles() {
 		return roles;
 	}

+ 7 - 0
src/main/java/com/goafanti/admin/controller/AdminSuperviserApiController.java

@@ -306,4 +306,11 @@ public class AdminSuperviserApiController extends CertifyApiController {
 		res.setData(newAdminService.selectAllByid(id));
 		return res;
 	}
+	/**删除用户**/
+	@RequestMapping(value = "/deleteById", method = RequestMethod.POST)
+	public Result deleteById(String id){
+		Result res = new Result();
+		newAdminService.deleteById(id);
+		return res;
+	}
 }

+ 2 - 0
src/main/java/com/goafanti/admin/service/NewAdminService.java

@@ -63,4 +63,6 @@ public interface NewAdminService {
 	
 	Admin selectAllByid(String id);	
 	
+	int deleteById(String id);
+	
 }

+ 7 - 0
src/main/java/com/goafanti/admin/service/impl/NewAdminServiceImpl.java

@@ -48,6 +48,7 @@ public class NewAdminServiceImpl extends BaseMybatisDao<AdminMapper> implements
 		List<AdminListBo> list=(List<AdminListBo>)p.getList();
 		for(AdminListBo i:list){
 			i.setRoles(adminMapper.selectRolesByUid(i.getId()));
+			i.setRolesId(adminMapper.selectRolesIdByUid(i.getId()));
 		}
 		return p;
 	}
@@ -292,4 +293,10 @@ public class NewAdminServiceImpl extends BaseMybatisDao<AdminMapper> implements
 		return admin;
 	}
 
+	@Override
+	public int deleteById(String id) {
+		adminMapper.deleteById(id);
+		return 1;
+	}
+
 }

+ 4 - 0
src/main/java/com/goafanti/common/dao/AdminMapper.java

@@ -74,6 +74,10 @@ public interface AdminMapper {
 	
 	List<String>selectRolesByUid(String id);
 	
+	List<String>selectRolesIdByUid(String id);
+	
 	String selectStatusByMobile(String mobile);
+	
+	int deleteById(String id);
 
 }

+ 11 - 0
src/main/java/com/goafanti/common/mapper/AdminMapper.xml

@@ -524,6 +524,13 @@
   	where
   	uid=#{id,jdbcType=VARCHAR}
   </select>
+  <select id= "selectRolesIdByUid" parameterType="java.lang.String" resultType="java.lang.String">
+  	select
+  	  rid as rolesId
+  	from user_role 
+  	where
+  	uid=#{id,jdbcType=VARCHAR}
+  </select>
   <select id= "selectStatusByMobile" parameterType="java.lang.String" resultType="java.lang.String" >
   	select 
    	  status
@@ -531,4 +538,8 @@
     where 
     mobile=#{mobile,jdbcType=VARCHAR}
   </select>
+  <delete id="deleteById" parameterType="java.lang.String" >
+  	delete from admin
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
 </mapper>