Merge branch 'master' of http://git.mokasz.com/marketing/moka-private

* 'master' of http://git.mokasz.com/marketing/moka-private:
  fix(增加查询指定企业交付管理员功能)

src/main/java/com/mokamrp/privates/controller/UserCorpController.java

@@ -81,6 +81,13 @@ public class UserCorpController {
         return AjaxResult.success(Constants.SUCCESS);
     }
 
+    /**
+     * 解绑企业和账户
+     * @param unSetUserCorpHandle
+     * @param authUser
+     * @param bindingResult
+     * @return
+     */
     @PostMapping("/unSetUserCorp")
     public Object unSetUserCorp(@Valid @RequestBody UnSetUserCorpHandle unSetUserCorpHandle, @AuthUser User authUser, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -94,12 +101,18 @@ public class UserCorpController {
         return AjaxResult.success(Constants.SUCCESS);
     }
 
-    @GetMapping("/getUserCorpsByUserId")
-    public Object getUserCorpsByUserId(@RequestParam(name = "userId") String UserId) {
-        if (UserId == null || UserId.isEmpty()) {
-            return AjaxResult.error("userId null");
+    /**
+     * 获取指定企业的小前台管理员列表
+     * @param corpId
+     * @return
+     */
+    @GetMapping("/getUserByCorpId")
+    public Object getUserCorpsByUserId(@RequestParam(name="corpId") Integer corpId){
+        if (corpId == null || corpId == 0){
+            return AjaxResult.error("corpId null");
         }
-        return null;
+        List<User> res = userCorpService.selectUserByCorpId(corpId);
+        return AjaxResult.success(res);
     }
 
 }

src/main/java/com/mokamrp/privates/mapper/UserCorpMapper.java

@@ -1,8 +1,13 @@
 package com.mokamrp.privates.mapper;
 
+import com.mokamrp.privates.mapper.pojo.User;
 import com.mokamrp.privates.mapper.pojo.UserCorp;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -13,5 +18,8 @@ import java.util.List;
  * @since 2021-04-17
  */
 public interface UserCorpMapper extends BaseMapper<UserCorp> {
-    public List<Integer> getCorpIds(Integer userId);
+
+    public List<Object> getCorpIds(Integer userId);
+
+    public List<User> selectUserByCorpId(@Param("corpId") Integer corpId);
 }

src/main/java/com/mokamrp/privates/mapper/UserCorpMapper.xml

@@ -29,5 +29,10 @@
             LEFT JOIN mc_corp AS a on b.corp_id = a.id
         where b.user_id = (#{userId});
     </select>
+    <select id="selectUserByCorpId" resultType="com.mokamrp.privates.mapper.pojo.User">
+        SELECT B.* FROM private_user_corp AS A
+                            LEFT JOIN private_user AS B ON A.user_id = B.id
+        WHERE A.corp_id = #{corpId} AND B.phone IS not null
+    </select>
 
 </mapper>

src/main/java/com/mokamrp/privates/service/UserCorpService.java

@@ -1,6 +1,7 @@
 package com.mokamrp.privates.service;
 
 import com.mokamrp.privates.mapper.pojo.Corp;
+import com.mokamrp.privates.mapper.pojo.User;
 import com.mokamrp.privates.mapper.pojo.UserCorp;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -18,33 +19,15 @@ import java.util.List;
 public interface UserCorpService extends IService<UserCorp> {
 
     public final static String USER_MSG = "您当前用户未绑定企业";
-
-    /**
-     * 获取指定管理账户管辖的企业信息
-     *
-     * @param userId
-     * @return
-     */
+    //. 获取指定管理账户管辖的企业信息
     public List<Corp> getCorpsByUserId(Integer userId);
-
-    /**
-     * 获取用户管理的企业ID
-     *
-     * @param userId
-     * @return
-     */
+    //. 获取用户管理的企业ID
     public List<Integer> getAuthUserCorpIds(String userId);
-
-    /**
-     * 绑定账户和企业
-     *
-     * @param userIds
-     * @param corpIds
-     * @return
-     */
+    //. 绑定账户和企业
     public boolean setUserCorpsByUserId(List<Integer> userIds, List<Integer> corpIds);
-
-    public boolean unSetUserCorp(Integer userId,Integer corpId);
-
+    //. 解绑账户和企业
+    public boolean unSetUserCorp(Integer userId, Integer corpId);
+    //. 通过企业ID获取企业的小前台管理员列表
+    public List<User> selectUserByCorpId(Integer corpId);
 
 }

src/main/java/com/mokamrp/privates/service/impl/UserCorpServiceImpl.java

@@ -15,6 +15,7 @@ import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -30,8 +31,8 @@ public class UserCorpServiceImpl extends ServiceImpl<UserCorpMapper, UserCorp> i
     @Autowired
     public CorpService corpService;
 
-//    @Autowired
-//    private UserCorpMapper userCorpMapper;
+    @Autowired
+    private UserCorpMapper userCorpMapper;
 
     /**
      * 获取指定管理账户管辖的企业信息
@@ -64,8 +65,8 @@ public class UserCorpServiceImpl extends ServiceImpl<UserCorpMapper, UserCorp> i
         return corpIds;
     }
 
-    public boolean unSetUserCorp(Integer userId,Integer corpId){
-        Boolean res = this.remove(new QueryWrapper<UserCorp>().eq("corp_id",corpId).eq("user_id",userId));
+    public boolean unSetUserCorp(Integer userId, Integer corpId) {
+        Boolean res = this.remove(new QueryWrapper<UserCorp>().eq("corp_id", corpId).eq("user_id", userId));
         return res;
     }
 
@@ -104,4 +105,15 @@ public class UserCorpServiceImpl extends ServiceImpl<UserCorpMapper, UserCorp> i
         return true;
 
     }
+
+    /**
+     * 获取指定企业的小前台管理员列表
+     *
+     * @param corpId
+     * @return
+     */
+    public List<User> selectUserByCorpId(Integer corpId) {
+        List<User> res = userCorpMapper.selectUserByCorpId(corpId);
+        return res;
+    }
 }