Merge branch 'chenhao' into developer

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgUsrController.java

@@ -15,6 +15,7 @@ import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.ESOrgUsrService;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.OrgUsrServiceImpl;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+import com.yeejoin.amos.feign.privilege.model.UserOrgTreeModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
@@ -80,7 +81,7 @@ public class OrgUsrController extends BaseController {
     public ResponseModel<String> deleteById(HttpServletRequest request, @PathVariable Long id) {
         // 删除时，只作逻辑删除
         // BUG 2741 首先判断是否为公司 如果公司底下有人员不可直接删除 bykongfm
-        OrgUsr tempOrg = iOrgUsrService.getById(id);
+        OrgUsr tempOrg = iOrgUsrService.getById(id.toString());
         if(tempOrg.getBizOrgType().equals("COMPANY")) {
             List<OrgUsr> tempList = iOrgUsrService.list(new LambdaQueryWrapper<OrgUsr>().eq(OrgUsr::getParentId,id).eq(OrgUsr::getIsDelete,false));
             if(tempList.size() > 0) {
@@ -415,5 +416,5 @@ public class OrgUsrController extends BaseController {
         List<Map<String, Object>> loginUserDetails = iOrgUsrService.getLoginUserDetails(userIds);
         return ResponseHelper.buildResponse(loginUserDetails);
     }
-
+    
 }
\ No newline at end of file