getParentOrgsByDeviceNo

src/main/java/com/hxgk/lowcode/controller/ManContController.java

@@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
 import java.util.Map;
 
 @RestController
@@ -20,8 +21,8 @@ public class ManContController {
     @Autowired
     UserService userService;
     /*根据主表id拿到表单字段信息*/
-    @RequestMapping(value = "getManCont")
-    public JsonData getFieldTree(@RequestBody Map<String,String> requestBody) {
+    @RequestMapping(value = "getParentOrgsByDeviceNo")
+    public JsonData getParentOrgsByDeviceNo(@RequestBody Map<String,String> requestBody) {
 
         String paramType = requestBody.get("paramType");
         String paramValue = requestBody.get("paramValue");
@@ -29,7 +30,17 @@ public class ManContController {
             if(paramType.equals("deviceNo")){
                 if(!StringUtils.isBlank(paramValue)){
                     ManCont manCont = userService.getManContByDeviceNo(paramType,paramValue);
-                    return JsonData.buildSuccess(manCont);
+                    if(null!=manCont){
+
+                        //查出该员工的所有父级部门
+                        List<String> parentOrgs = userService.getAllParentOrgForEmp(manCont);
+                        return JsonData.buildSuccess(parentOrgs);
+                        //return JsonData.buildError("当前deviceNo没有绑定员工,可以xxl-job手动同步一下试试");
+
+                    }else{
+                        return JsonData.buildError("当前deviceNo没有绑定员工,可以xxl-job手动同步一下试试");
+                    }
+
                 }else{
                     return JsonData.buildError("paramValue 非法,isBlank");
                 }
@@ -41,16 +52,7 @@ public class ManContController {
             return JsonData.buildError("paramType 非法, isBlank");
         }
 
-        /*if(tree.getId()==null){
-            return JsonData.buildError("查无此表单");
-        }else{
-            if(tree.getId().equals("cfid为空")){
-                return JsonData.buildSuccess(tree);
-            }else if(tree.getId().equals("masterTable为null")){
-                return JsonData.buildSuccess(tree);
-            }
-            return JsonData.buildSuccess(tree);
-        }*/
+
 
     }
 }

src/main/java/com/hxgk/lowcode/mapper/UserMapper.java

@@ -17,4 +17,6 @@ public interface UserMapper {
     List<Tree> getManContListByAdminOrg(@Param("adminOrg")String adminOrg);
 
     ManCont getManContByKey(@Param("key") String key);
+
+    ManCont getManContByDeviceNo(@Param("deviceNo") String deviceNo);
 }

src/main/java/com/hxgk/lowcode/service/UserService.java

@@ -21,4 +21,6 @@ public interface UserService {
     List<Tree> getManContListByAdminOrg(String adminOrg);
 
     ManCont getManContByDeviceNo(String paramType,String paramValue);
+
+    List<String> getAllParentOrgForEmp(ManCont manCont);
 }

src/main/java/com/hxgk/lowcode/service/impl/CustomerFormServiceImpl.java

@@ -535,9 +535,7 @@ public class CustomerFormServiceImpl implements CustomerFormService {
             String userKey = key;
             String onlyToShowTableId = "";
 
-            //上线修改
-            String url = "http://172.20.2.87:7777/customer_form/gainTableVersionField";//本地+内网
-            //String url = "http://36.133.126.182:39250/customer_form/gainTableVersionField";//外网
+
             if(cfid.contains("zibiaoid-")){
                 onlyToShowTableId = cfid.split("zibiaoid-")[1];
                 cfid = cfid.split(":")[0];//当选择某个主表的子表时，连主表数据一并返回。

src/main/java/com/hxgk/lowcode/service/impl/UserServiceImpl.java

@@ -5,9 +5,11 @@ import com.hxgk.lowcode.mapper.UserMapper;
 import com.hxgk.lowcode.model.entity.ManCont;
 import com.hxgk.lowcode.model.entity.Tree;
 import com.hxgk.lowcode.model.entity.UserDetail;
+import com.hxgk.lowcode.service.HrService;
 import com.hxgk.lowcode.service.UserService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.data.redis.core.HashOperations;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
@@ -23,6 +25,9 @@ public class UserServiceImpl implements UserService {
     private StringRedisTemplate redisTemplate;
     @Autowired
     private UserMapper userMapper;
+    @Lazy
+    @Autowired
+    private HrService hrService;
 
     /**
      * 从redis中根据userkey和usertoken获取userDetail
@@ -132,16 +137,41 @@ public class UserServiceImpl implements UserService {
     @DS("hrnew")
     @Override
     public ManCont getManContByDeviceNo(String paramType,String paramValue) {
+
+        try{
             //先从科远库查出该paramValue对应的工号
-        String number = getNumberByDeviceNo(paramValue);
+            ManCont manContByDeviceNo = userMapper.getManContByDeviceNo(paramValue);
+            return manContByDeviceNo;
+        }catch(Exception e){
+            e.printStackTrace();
             return null;
         }
 
+    }
+    @DS("hrnew")
+    @Override
+    public List<String> getAllParentOrgForEmp(ManCont manCont) {
+        try{
+            String adminOrgObj = manCont.getAdminOrg().toString();
+            //调用方法判断
+
+            /*   1.获取ownerValue的adminOrgObj(所属行政组织),
+             *   2.从1获取到的主部门id向上查询到所有祖先部门数组,
+             *   3.查看targetOrgOrPerson是否在2查询到的数组中
+             */
+            Tree orgAndManTree = hrService.getOrgAndManTree();
+            //所有祖先部门
+            List<String> ancestorIds = orgAndManTree.getAncestorIds(adminOrgObj);
+            return ancestorIds;
+        }catch(Exception e){
+            e.printStackTrace();
+            return null;
+        }
 
 
-    private String getNumberByDeviceNo(String paramValue) {
-        return null;
     }
 
 
+
+
 }

src/main/resources/mapper/UserMapper.xml

@@ -21,4 +21,10 @@
 
     </select>
 
+    <select id="getManContByDeviceNo" resultType="com.hxgk.lowcode.model.entity.ManCont">
+
+      select number,admin_org from man_cont where `deviceNo` = #{deviceNo}
+
+    </select>
+
 </mapper>