苏州分公司发票数据同步调整-所属部门

src/main/java/com/jeeplus/modules/sys/dao/UserDao.java

@@ -359,4 +359,12 @@ public interface UserDao extends CrudDao<User> {
 
 
 	void updateUpdatePasswordDate(User user);
+
+	/**
+	 * 根据手机号和姓名获取用户信息
+	 * @param createMobile
+	 * @param createByName
+	 * @return
+	 */
+    User getByNameAndMobile(@Param("createMobile")String createMobile, @Param("createByName")String createByName);
 }

src/main/java/com/jeeplus/modules/sys/service/UserService.java

@@ -712,4 +712,8 @@ public class UserService extends BaseController {
             }
         }
     }
+
+    public User getByNameAndMobile(String createMobile, String createByName) {
+        return userDao.getByNameAndMobile(createMobile,createByName);
+    }
 }

src/main/java/com/jeeplus/modules/szCenterservice/service/szCloud/FinanceInvoiceService.java

@@ -10,6 +10,7 @@ import com.jeeplus.modules.sys.entity.Office;
 import com.jeeplus.modules.sys.entity.User;
 import com.jeeplus.modules.sys.entity.Workattachment;
 import com.jeeplus.modules.sys.service.OfficeService;
+import com.jeeplus.modules.sys.service.UserService;
 import com.jeeplus.modules.sys.service.WorkattachmentService;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientAttachment;
@@ -53,6 +54,9 @@ public class FinanceInvoiceService {
     @Autowired
     private OfficeService officeService;
 
+    @Autowired
+    private UserService userService;
+
     /**
      * 查询发票详情
      * @param id
@@ -359,14 +363,18 @@ public class FinanceInvoiceService {
             if (Objects.nonNull(resp.get("id"))) {
                 result.setId(resp.get("id").toString());
             }
-            if (Objects.nonNull(resp.get("createByName"))){
+            if (Objects.nonNull(resp.get("createByName")) && Objects.nonNull(resp.get("createMobile")) ){
                 String createByName = (String) resp.get("createByName");
-                User user = UserUtils.getByUserName(createByName);
-                result.setCreateBy(user);
-                result.setUpdateBy(user);
-                Office office = officeService.get(user.getOffice().getId());
-                result.setOffice(office);
-                result.setCompanyId(user.getCompany().getId());
+                String createMobile = (String) resp.get("createMobile");
+                User user = userService.getByNameAndMobile(createMobile,createByName);
+                if (user!= null){
+                    result.setCreateBy(user);
+                    result.setUpdateBy(user);
+                    Office office = officeService.get(user.getOffice().getId());
+                    result.setOffice(office);
+                    result.setCompanyId(user.getCompany().getId());
+                }
+
             }
             if (Objects.nonNull(resp.get("status"))){
                 result.setInvoiceState(resp.get("status").toString());

src/main/resources/mappings/modules/sys/UserDao.xml

@@ -1413,4 +1413,13 @@
 		where id = #{id}
 	</update>
 
+	<select id="getByNameAndMobile"  resultType="User">
+		SELECT
+		<include refid="userColumns"/>
+		FROM sys_user a
+		LEFT JOIN sys_office s ON s.id = a.company_id
+		LEFT JOIN sys_office o ON o.id = a.office_id
+		LEFT JOIN sys_office bo ON bo.id = o.branch_office
+		WHERE a.name = #{createByName} and a.mobile = #{createMobile} AND a.del_flag = 0
+	</select>
 </mapper>