修复赋码过程sql参数指定错

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/mapper/ProjectImmobileCodeMapper.java

@@ -20,7 +20,7 @@ public interface ProjectImmobileCodeMapper {
     /**
      * 根据项目ID查询（多条）
      */
-    List<ProjectImmobileCode> selectByProjectId(String projectId,String validFlag);
+    List<ProjectImmobileCode> selectByProjectId(@Param("projectId") String projectId,@Param("validFlag") String validFlag);
 
     /**
      * 根据序号查询（只返回一条）

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/impl/ProjectImpl.java

@@ -1984,7 +1984,7 @@ public class ProjectImpl implements ProjectService {
             Boolean equalsFlag = true;
             List<Map<String, Object>> currentNodeDetails = nodeLandMapper.selectGeomDetailsByGeomDbId(currentNodeGeomDbId);
             //这里简单判断，如果当前节点的图斑在当前项目其它节点都存在，则认为地块是存在地块，并且已经赋码完成，取最后一次的节点预赋码为当前码
-            if (!currentNodeDetails.isEmpty()) {
+            if (!currentNodeDetails.isEmpty() && !nodeIdList.isEmpty()) {
                 for (Map<String, Object> tmpMap : currentNodeDetails) {
                     String detailsId = tmpMap.get("id").toString();
                     Map<String, String> equalsGeomMap = nodeLandMapper.selectNodeGeomContains(nodeIdList, detailsId);

siwei-modules/siwei-apply/src/main/resources/mapper/ProjectImmobileCodeMapper.xml

@@ -40,7 +40,7 @@
         <include refid="Base_Column_List"/>
         FROM t_project_immobile_code
         WHERE project_id = #{projectId}
-        <if test="validFlag != null validFlag!='' ">
+        <if test="validFlag != null and validFlag !='' ">
             AND  valid_flag = #{validFlag}
         </if>
     </select>